...
 
Commits (9)
python-cartopy (0.16.0+dfsg1-1) unstable; urgency=medium
[ Antonio Valentino ]
* New upstream release (Closes: #854167).
* Update copyright file.
* Set compat to 11.
......@@ -25,6 +26,20 @@ python-cartopy (0.16.0+dfsg1-1) unstable; urgency=medium
* debian/rules
- switch to pytst
[ Bas Couwenberg ]
* Update Repository URL to use HTTPS in upstream metadata.
* Update Homepage URL to use HTTPS.
* Reorder dependencies.
* Capitalize first letter in short description.
* Update watch file to handle common issues.
* Update copyright file, changes:
- Use standalone license paragraphs
- Fix PSF license terms (Python-2.0)
- Use standard public-domain license shortname
* Update gbp.conf conform the Debian GIS Policy.
* Refresh patches.
* Align paths in install and link files.
-- Antonio Valentino <antonio.valentino@tiscali.it> Fri, 08 Jun 2018 20:18:37 +0000
python-cartopy (0.14.2+dfsg1-2) unstable; urgency=medium
......
......@@ -31,22 +31,22 @@ Build-Depends: cython,
Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/debian-gis-team/python-cartopy
Vcs-Git: https://salsa.debian.org/debian-gis-team/python-cartopy.git
Homepage: http://scitools.org.uk/cartopy/
Homepage: https://scitools.org.uk/cartopy/
Package: python-cartopy
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${python:Depends},
Depends: python-cartopy-data (= ${source:Version}),
${shlibs:Depends},
python-cartopy-data (= ${source:Version})
${python:Depends},
${misc:Depends}
Suggests: python-gdal,
python-matplotlib,
python-owslib,
python-pil,
python-pyepsg,
python-scipy
Description: cartographic library for Python 2
Description: Cartographic library for Python 2
Cartopy is a Python package designed to make drawing maps for data analysis
and visualisation easy.
.
......@@ -64,17 +64,17 @@ Description: cartographic library for Python 2
Package: python3-cartopy
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${python3:Depends},
Depends: python-cartopy-data (= ${source:Version}),
${shlibs:Depends},
python-cartopy-data (= ${source:Version})
${python3:Depends},
${misc:Depends}
Suggests: python3-gdal,
python3-matplotlib,
python3-owslib,
python3-pil,
python3-pyepsg,
python3-scipy
Description: cartographic library for Python 3
Description: Cartographic library for Python 3
Cartopy is a Python package designed to make drawing maps for data analysis
and visualisation easy.
.
......
This diff is collapsed.
[DEFAULT]
# The default name for the upstream branch is "upstream".
# Change it if the name is different (for instance, "master").
upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
debian-branch = master
# git-import-orig uses the following names for the upstream tags.
# Change the value if you are not using git-import-orig
upstream-tag = upstream/%(version)s
debian-tag = debian/%(version)s
sign-tags = True
# Always use pristine-tar.
pristine-tar = True
......@@ -2,15 +2,9 @@ From: Ghislain Antony Vaillant <ghisvail@gmail.com>
Date: Sat, 14 Jan 2017 10:26:34 +0000
Subject: Skip tests failing on i386 architectures
---
lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py b/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
index b6fb853..92abf8c 100644
--- a/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
+++ b/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
@@ -22,6 +22,10 @@ from numpy.testing import assert_almost_equal
@@ -22,6 +22,10 @@ from numpy.testing import assert_almost_
import cartopy.crs as ccrs
......@@ -21,7 +15,7 @@ index b6fb853..92abf8c 100644
class TestLambertAzimuthalEqualArea(object):
def test_default(self):
@@ -33,9 +37,10 @@ class TestLambertAzimuthalEqualArea(object):
@@ -33,9 +37,10 @@ class TestLambertAzimuthalEqualArea(obje
assert_almost_equal(np.array(crs.x_limits),
[-12755636.1863, 12755636.1863],
decimal=4)
......
......@@ -4,13 +4,7 @@ Subject: Compatibility with proj5 +over
See also https://github.com/OSGeo/proj.4/issues/985 and
https://github.com/OSGeo/proj.4/issues/941.
---
lib/cartopy/crs.py | 3 ++-
lib/cartopy/tests/crs/test_mercator.py | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/cartopy/crs.py b/lib/cartopy/crs.py
index 57fb8c0..ee2bda7 100644
--- a/lib/cartopy/crs.py
+++ b/lib/cartopy/crs.py
@@ -964,7 +964,8 @@ class Mercator(Projection):
......@@ -23,8 +17,6 @@ index 57fb8c0..ee2bda7 100644
super(Mercator, self).__init__(proj4_params, globe=globe)
# Calculate limits.
diff --git a/lib/cartopy/tests/crs/test_mercator.py b/lib/cartopy/tests/crs/test_mercator.py
index 522d5e9..5c04935 100644
--- a/lib/cartopy/tests/crs/test_mercator.py
+++ b/lib/cartopy/tests/crs/test_mercator.py
@@ -26,7 +26,7 @@ def test_default():
......
......@@ -2,12 +2,6 @@ From: Antonio Valentino <antonio.valentino@tiscali.it>
Date: Mon, 21 May 2018 22:08:04 +0000
Subject: Compatibility with proj5 TM
---
lib/cartopy/tests/crs/test_transverse_mercator.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/cartopy/tests/crs/test_transverse_mercator.py b/lib/cartopy/tests/crs/test_transverse_mercator.py
index c25439f..f32fd79 100644
--- a/lib/cartopy/tests/crs/test_transverse_mercator.py
+++ b/lib/cartopy/tests/crs/test_transverse_mercator.py
@@ -97,8 +97,8 @@ class TestOSNI(object):
......
lib/cartopy/data/raster usr/share/cartopy/data/raster
lib/cartopy/data/shapefiles usr/share/cartopy/data/shapefiles
lib/cartopy/data/raster usr/share/cartopy/data/raster
lib/cartopy/data/shapefiles usr/share/cartopy/data/shapefiles
lib/cartopy/tests/mpl/baseline_images usr/share/cartopy/tests/mpl/baseline_images
usr/share/cartopy/data usr/lib/python2.7/dist-packages/cartopy/data
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
usr/share/cartopy/data usr/lib/python3/dist-packages/cartopy/data
usr/share/cartopy/data usr/lib/python3/dist-packages/cartopy/data
usr/share/cartopy/tests/mpl/baseline_images usr/lib/python3/dist-packages/cartopy/tests/mpl/baseline_images
......@@ -2,5 +2,5 @@ Bug-Database: https://github.com/SciTools/cartopy/issues
Bug-Submit: https://github.com/SciTools/cartopy/issues/new
Changelog: https://github.com/SciTools/cartopy/blob/master/docs/source/whats_new.rst
Name: cartopy
Repository: git@github.com:SciTools/cartopy.git
Repository: https://github.com/SciTools/cartopy.git
Repository-Browse: https://github.com/SciTools/cartopy
version=4
opts=repacksuffix=+dfsg1,\
dversionmangle=s/\+dfsg(\.?\d+)?$//,\
uversionmangle=s/(rc|a|b|c)/~$1/,\
filenamemangle=s/.+\/v?@ANY_VERSION@\.tar\.gz/cartopy-$1\.tar\.gz/ \
https://github.com/SciTools/cartopy/tags .*/v?@ANY_VERSION@\.tar\.gz
opts=\
dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|c|beta|b|alpha|a)\d*)$/$1~$2/,\
filenamemangle=s/(?:.*?)?(?:rel|v|cartopy)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/cartopy-$1.$2/,\
repacksuffix=+dfsg \
https://github.com/SciTools/cartopy/tags \
(?:.*?/)?(?:rel|v|cartopy)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))