[Git][debian-gis-team/python-cartopy][master] 2 commits: Link examples into the doc directory

[Antonio Valentino]

Antonio Valentino pushed to branch master at Debian GIS Project / python-cartopy


Commits:
f45756bc by Antonio Valentino at 2019-02-10T11:52:04Z
Link examples into the doc directory

- - - - -
c9997d77 by Antonio Valentino at 2019-02-10T11:54:19Z
Refresh and renumber all patches

- - - - -


6 changed files:

- debian/changelog
- debian/patches/0001-Skip-tests-failing-on-i386-architectures.patch
- debian/patches/no-network.patch → debian/patches/0002-no-network.patch
- debian/patches/series
- debian/python-cartopy.links
- debian/python3-cartopy.links


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+python-cartopy (0.17.0+dfsg-4) UNRELEASED; urgency=medium
+
+  * Link examples into the doc directory.
+  * debian/patches:
+    - refresh and renumber all patches.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 10 Feb 2019 08:40:13 +0000
+
 python-cartopy (0.17.0+dfsg-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0001-Skip-tests-failing-on-i386-architectures.patch
=====================================
@@ -2,9 +2,17 @@ From: Ghislain Antony Vaillant <ghisvail at 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 | 3 +++
+ lib/cartopy/tests/mpl/test_features.py                     | 3 +++
+ lib/cartopy/tests/mpl/test_images.py                       | 3 +++
+ 3 files changed, 9 insertions(+)
+
+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 93663d0..790b7f3 100644
 --- a/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
 +++ b/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
-@@ -20,6 +20,7 @@ from __future__ import (absolute_import,
+@@ -20,6 +20,7 @@ from __future__ import (absolute_import, division, print_function)
  import numpy as np
  from numpy.testing import assert_almost_equal
  import pytest
@@ -21,9 +29,11 @@ Subject: Skip tests failing on i386 architectures
      def test_default(self):
          crs = ccrs.LambertAzimuthalEqualArea()
          other_args = {'ellps=WGS84', 'lon_0=0.0', 'lat_0=0.0', 'x_0=0.0',
+diff --git a/lib/cartopy/tests/mpl/test_features.py b/lib/cartopy/tests/mpl/test_features.py
+index 250e3db..f3cc54f 100644
 --- a/lib/cartopy/tests/mpl/test_features.py
 +++ b/lib/cartopy/tests/mpl/test_features.py
-@@ -19,6 +19,7 @@ from __future__ import (absolute_import,
+@@ -19,6 +19,7 @@ from __future__ import (absolute_import, division, print_function)
  
  import matplotlib.pyplot as plt
  import pytest
@@ -40,6 +50,8 @@ Subject: Skip tests failing on i386 architectures
  @ImageTesting(['gshhs_coastlines'],
                tolerance=1.7 if MPL_VERSION < '2' else 0)
  def test_gshhs():
+diff --git a/lib/cartopy/tests/mpl/test_images.py b/lib/cartopy/tests/mpl/test_images.py
+index 55a7ee5..3991db4 100644
 --- a/lib/cartopy/tests/mpl/test_images.py
 +++ b/lib/cartopy/tests/mpl/test_images.py
 @@ -18,6 +18,7 @@


=====================================
debian/patches/no-network.patch → debian/patches/0002-no-network.patch
=====================================
@@ -1,10 +1,17 @@
-Description: Mark additional tests as requiring network.
-Author: Bas Couwenberg <sebastic at debian.org>
+From: Bas Couwenberg <sebastic at debian.org>
+Date: Sun, 10 Feb 2019 11:52:26 +0000
+Subject: Mark additional tests as requiring network.
+
 Forwarded: https://github.com/SciTools/cartopy/issues/1206
+---
+ lib/cartopy/tests/mpl/test_nightshade.py | 1 +
+ 1 file changed, 1 insertion(+)
 
+diff --git a/lib/cartopy/tests/mpl/test_nightshade.py b/lib/cartopy/tests/mpl/test_nightshade.py
+index 5922609..8395ab6 100644
 --- a/lib/cartopy/tests/mpl/test_nightshade.py
 +++ b/lib/cartopy/tests/mpl/test_nightshade.py
-@@ -27,6 +27,7 @@ from cartopy.feature.nightshade import N
+@@ -27,6 +27,7 @@ from cartopy.feature.nightshade import Nightshade
  from cartopy.tests.mpl import ImageTesting
  
  


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,2 @@
 0001-Skip-tests-failing-on-i386-architectures.patch
-no-network.patch
+0002-no-network.patch


=====================================
debian/python-cartopy.links
=====================================
@@ -1,2 +1,3 @@
 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/lib/python2.7/dist-packages/cartopy/examples usr/share/doc/python2.7-cartopy/examples


=====================================
debian/python3-cartopy.links
=====================================
@@ -1,2 +1,3 @@
 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
+usr/lib/python3/dist-packages/cartopy/examples usr/share/doc/python3-cartopy/examples



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/3e166ab3be6dbb4fbbfd805e06046bde55969945...c9997d774e8850e047cdb241549af62f18e59096

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/3e166ab3be6dbb4fbbfd805e06046bde55969945...c9997d774e8850e047cdb241549af62f18e59096
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/20190210/6c6f3a4f/attachment-0001.html>