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.
This commit is contained in:
parent
3c6f7b53ce
commit
25f702449c
|
@ -1097,9 +1097,14 @@ (define-public gdal
|
||||||
proj
|
proj
|
||||||
qhull
|
qhull
|
||||||
sqlite
|
sqlite
|
||||||
zlib))
|
swig
|
||||||
|
zlib
|
||||||
|
zstd))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config))
|
(list pkg-config
|
||||||
|
python))
|
||||||
|
(propagated-inputs
|
||||||
|
(list python-numpy))
|
||||||
(home-page "https://gdal.org/")
|
(home-page "https://gdal.org/")
|
||||||
(synopsis "Raster and vector geospatial data format library")
|
(synopsis "Raster and vector geospatial data format library")
|
||||||
(description "GDAL is a translator library for raster and vector geospatial
|
(description "GDAL is a translator library for raster and vector geospatial
|
||||||
|
@ -1128,25 +1133,6 @@ (define-public gdal
|
||||||
;; frmts/mrf/libLERC
|
;; frmts/mrf/libLERC
|
||||||
license:asl2.0))))
|
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
|
(define-public python-pyshp
|
||||||
(package
|
(package
|
||||||
(name "python-pyshp")
|
(name "python-pyshp")
|
||||||
|
@ -2554,6 +2540,7 @@ (define-public qgis
|
||||||
"ProcessingQgisAlgorithmsTestPt2"
|
"ProcessingQgisAlgorithmsTestPt2"
|
||||||
"ProcessingQgisAlgorithmsTestPt3"
|
"ProcessingQgisAlgorithmsTestPt3"
|
||||||
"ProcessingQgisAlgorithmsTestPt4"
|
"ProcessingQgisAlgorithmsTestPt4"
|
||||||
|
"ProcessingGdalAlgorithmsRasterTest"
|
||||||
"ProcessingGdalAlgorithmsVectorTest"
|
"ProcessingGdalAlgorithmsVectorTest"
|
||||||
"ProcessingGrass7AlgorithmsImageryTest"
|
"ProcessingGrass7AlgorithmsImageryTest"
|
||||||
"ProcessingGrass7AlgorithmsRasterTestPt1"
|
"ProcessingGrass7AlgorithmsRasterTestPt1"
|
||||||
|
@ -2671,7 +2658,6 @@ (define-public qgis
|
||||||
python-chardet
|
python-chardet
|
||||||
python-dateutil
|
python-dateutil
|
||||||
python-future
|
python-future
|
||||||
python-gdal
|
|
||||||
python-jinja2
|
python-jinja2
|
||||||
python-numpy
|
python-numpy
|
||||||
python-owslib
|
python-owslib
|
||||||
|
|
Loading…
Reference in a new issue