[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: gnu: Merge gdal and python-gdal packages.
From: |
guix-commits |
Subject: |
08/08: gnu: Merge gdal and python-gdal packages. |
Date: |
Tue, 20 Dec 2022 11:59:14 -0500 (EST) |
glv pushed a commit to branch master
in repository guix.
commit 25f702449c8683b3ec78b2e4a5728e700462e5a2
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Tue Dec 20 17:01:41 2022 +0100
gnu: Merge gdal and python-gdal packages.
* gnu/packages/geo.scm (gdal)[inputs]: Add swig and zstd.
[native-inputs]: Add python.
[propagated-inputs]: Add python-numpy.
(python-gdal): Remove variable.
(qgis)[inputs]: Remove python-gdal.
[arguments]: Disable a flaky test.
---
gnu/packages/geo.scm | 30 ++++++++----------------------
1 file changed, 8 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 02259c2f6c..2185af7a98 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1097,9 +1097,14 @@ development.")
proj
qhull
sqlite
- zlib))
+ swig
+ zlib
+ zstd))
(native-inputs
- (list pkg-config))
+ (list pkg-config
+ python))
+ (propagated-inputs
+ (list python-numpy))
(home-page "https://gdal.org/")
(synopsis "Raster and vector geospatial data format library")
(description "GDAL is a translator library for raster and vector geospatial
@@ -1128,25 +1133,6 @@ utilities for data translation and processing.")
;; frmts/mrf/libLERC
license:asl2.0))))
-(define-public python-gdal
- (package (inherit gdal)
- (name "python-gdal")
- (build-system python-build-system)
- (arguments
- '(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'chdir
- (lambda _
- (chdir "swig/python")
- #t)))))
- (native-inputs '())
- (propagated-inputs
- (list python-numpy))
- (inputs
- (list gdal))
- (synopsis "GDAL (Geospatial Data Abstraction Library) python bindings")))
-
(define-public python-pyshp
(package
(name "python-pyshp")
@@ -2554,6 +2540,7 @@ growing set of geoscientific methods.")
"ProcessingQgisAlgorithmsTestPt2"
"ProcessingQgisAlgorithmsTestPt3"
"ProcessingQgisAlgorithmsTestPt4"
+ "ProcessingGdalAlgorithmsRasterTest"
"ProcessingGdalAlgorithmsVectorTest"
"ProcessingGrass7AlgorithmsImageryTest"
"ProcessingGrass7AlgorithmsRasterTestPt1"
@@ -2671,7 +2658,6 @@ growing set of geoscientific methods.")
python-chardet
python-dateutil
python-future
- python-gdal
python-jinja2
python-numpy
python-owslib
- branch master updated (fcc4e51e61 -> 25f702449c), guix-commits, 2022/12/20
- 06/08: gnu: gdal: Update to 3.6.1., guix-commits, 2022/12/20
- 03/08: gnu: python-pyproj: Update to 3.4.0., guix-commits, 2022/12/20
- 02/08: gnu: libgeotiff: Apply patch for building against proj 9.1.1., guix-commits, 2022/12/20
- 08/08: gnu: Merge gdal and python-gdal packages.,
guix-commits <=
- 07/08: gnu: gdal: Add support for lz4 and openjpeg., guix-commits, 2022/12/20
- 05/08: gnu: geos: Update to 3.11.1., guix-commits, 2022/12/20
- 01/08: gnu: proj: Update to 9.1.1., guix-commits, 2022/12/20
- 04/08: gnu: python-cartopy: Update to 0.21.0., guix-commits, 2022/12/20