[Git][debian-gis-team/python-cartopy][master] 5 commits: Drop Python 2 support
Antonio Valentino
gitlab at salsa.debian.org
Sun Jul 21 16:06:39 BST 2019
Antonio Valentino pushed to branch master at Debian GIS Project / python-cartopy
Commits:
1bec8928 by Antonio Valentino at 2019-07-21T14:42:24Z
Drop Python 2 support
- - - - -
1679f762 by Antonio Valentino at 2019-07-21T15:02:43Z
Set compat to 12
- - - - -
61ac3ade by Antonio Valentino at 2019-07-21T15:02:50Z
Drop unnecessary greater-than versioned dependency
- - - - -
1d1790c9 by Antonio Valentino at 2019-07-21T15:02:50Z
Improved clean rule
- - - - -
ab72fff2 by Antonio Valentino at 2019-07-21T15:03:09Z
Set distribution to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/compat
- debian/control
- − debian/python-cartopy.links
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+python-cartopy (0.17.0+dfsg-5) unstable; urgency=medium
+
+ * Drop Python 2 support.
+ * Set compat to 12.
+ * Remove unnecessary greater-than versioned dependency from
+ python3-six
+ * debian/rules:
+ - improved clean rule
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Sun, 21 Jul 2019 15:02:58 +0000
+
python-cartopy (0.17.0+dfsg-4) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12
=====================================
debian/control
=====================================
@@ -4,28 +4,12 @@ Uploaders: Ghislain Antony Vaillant <ghisvail at gmail.com>,
Antonio Valentino <antonio.valentino at tiscali.it>
Section: python
Priority: optional
-Build-Depends: cython,
- cython3,
- debhelper (>= 11),
+Build-Depends: cython3,
+ debhelper (>= 12),
dh-python,
libgeos-dev,
libproj-dev (>= 4.9.0),
proj-bin,
- python-all-dev,
- python-filelock,
- python-fiona,
- python-matplotlib,
- python-mock,
- python-numpy,
- python-pil,
- python-pykdtree,
- python-pyshp,
- python-pytest,
- python-scipy,
- python-setuptools,
- python-shapely (>= 1.5.6),
- python-six (>= 1.3.0),
- python-tk,
python3-all-dev,
python3-filelock,
python3-fiona,
@@ -38,7 +22,7 @@ Build-Depends: cython,
python3-scipy,
python3-setuptools,
python3-shapely (>= 1.5.6),
- python3-six (>= 1.3.0),
+ python3-six,
python3-tk,
xauth,
xvfb
@@ -47,35 +31,6 @@ Vcs-Browser: https://salsa.debian.org/debian-gis-team/python-cartopy
Vcs-Git: https://salsa.debian.org/debian-gis-team/python-cartopy.git
Homepage: https://scitools.org.uk/cartopy/
-Package: python-cartopy
-Architecture: any
-Depends: python-cartopy-data (= ${source:Version}),
- ${shlibs:Depends},
- ${python:Depends},
- ${misc:Depends}
-Suggests: python-fiona,
- python-gdal,
- python-matplotlib,
- python-owslib,
- python-pil,
- python-pyepsg,
- python-pykdtree,
- python-scipy
-Description: Cartographic library for Python 2
- Cartopy is a Python package designed to make drawing maps for data analysis
- and visualisation easy.
- .
- It features:
- .
- - object oriented projection definitions
- - point, line, polygon and image transformations between projections
- - integration to expose advanced mapping in matplotlib with a simple and
- intuitive interface
- - powerful vector data handling by integrating shapefile reading with
- Shapely capabilities
- .
- This package provides the Python 2 library.
-
Package: python3-cartopy
Architecture: any
Depends: python-cartopy-data (= ${source:Version}),
=====================================
debian/python-cartopy.links deleted
=====================================
@@ -1,3 +0,0 @@
-usr/lib/python2.7/dist-packages/cartopy/examples usr/share/doc/python2.7-cartopy/examples
-usr/share/cartopy/data usr/lib/python2.7/dist-packages/cartopy/data
-usr/share/cartopy/tests/mpl/baseline_images usr/lib/python2.7/dist-packages/cartopy/tests/mpl/baseline_images
=====================================
debian/rules
=====================================
@@ -18,11 +18,12 @@ export PYBUILD_TEST_PYTEST = 1
export PYBUILD_TEST_ARGS = --pyargs -m "not network and not natural_earth"
%:
- dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
override_dh_auto_clean:
dh_auto_clean || true
- rm -rf .pybuild
+ $(RM) -r .pybuild
+ $(RM) -r __pycache__
override_dh_auto_test:
xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" dh_auto_test
@@ -30,13 +31,11 @@ override_dh_auto_test:
override_dh_auto_install:
mkdir -p debian/python-cartopy-data/usr/share/cartopy/data
dh_auto_install
- $(RM) -r debian/python-cartopy/usr/lib/python2.7/dist-packages/cartopy/data
- $(RM) -r debian/python-cartopy/usr/lib/python2.7/dist-packages/cartopy/tests/mpl/baseline_images
$(RM) -r debian/python3-cartopy/usr/lib/python3*/dist-packages/cartopy/data
$(RM) -r debian/python3-cartopy/usr/lib/python3*/dist-packages/cartopy/tests/mpl/baseline_images
override_dh_install:
- dh_install --list-missing
+ dh_install
# Remove documentation outside usr/share/doc
$(RM) debian/*/usr/share/cartopy/data/shapefiles/gshhs/README.TXT
@@ -44,10 +43,6 @@ override_dh_install:
# Don't include test output
$(RM) -r debian/*/usr/lib/python*/dist-packages/cartopy_test_output
-override_dh_python2:
- dh_python2
- dh_numpy
-
override_dh_python3:
dh_python3
dh_numpy3
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/0b8db91a86aef633620369f17863d71fe52d1009...ab72fff2d29792e5c5307c8e9af1e10bb1cd4b5c
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/0b8db91a86aef633620369f17863d71fe52d1009...ab72fff2d29792e5c5307c8e9af1e10bb1cd4b5c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190721/187e3162/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list