[pyresample] 05/06: Fix automatoc testing with autophktest

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository pyresample.

commit 1517d33210ca5905f597a6bd6440d3f6c94330f3
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Oct 29 18:06:00 2016 +0000

    Fix automatoc testing with autophktest
---
 debian/changelog                      |  2 ++
 debian/control                        | 12 ++++++------
 debian/python-pyresample-test.install |  3 +--
 debian/python-pyresample.links        |  1 +
 debian/python3-pyresample.links       |  1 +
 debian/tests/python2                  |  2 +-
 debian/tests/python3                  |  2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4471de2..eff4eec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ pyresample (1.2.6-1) UNRELEASED; urgency=medium
   * New upstream release
   * debian/patches
     - drop 0003-fix-tests-for-mips.patch: applied upstream
+  * Fix automatic testing with autopkgtest (closes: #840286)
+    Now python*-pyresample package depend on python-pyresample-test
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 29 Oct 2016 07:31:45 +0000
 
diff --git a/debian/control b/debian/control
index 1f0405c..dbbd7af 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,8 @@ Depends: ${misc:Depends},
          python-configobj,
          python-numpy,
          python-pyproj,
-         python-pykdtree (>= 1.1.1)
+         python-pykdtree (>= 1.1.1),
+         python-pyresample-test
 Recommends: python-numexpr,
             python-mpltoolkits.basemap
 Suggests: python-pyresample-doc
@@ -63,7 +64,8 @@ Depends: ${misc:Depends},
          python3-configobj,
          python3-numpy,
          python3-pyproj,
-         python3-pykdtree (>= 1.1.1)
+         python3-pykdtree (>= 1.1.1),
+         python-pyresample-test
 Recommends: python3-numexpr,
             python3-mpltoolkits.basemap
 Suggests: python-pyresample-doc
@@ -97,9 +99,7 @@ Description: Resampling of remote sensing data in Python (documentation)
 
 Package: python-pyresample-test
 Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends},
-         python-pyresample
+Depends: ${misc:Depends}
 Description: Resampling of remote sensing data in Python (test suite)
  Pyresample is a Python package for resampling (reprojection) of earth
  observing satellite data. It handles both resampling of gridded data
@@ -109,4 +109,4 @@ Description: Resampling of remote sensing data in Python (test suite)
  Pyresample can use multiple processor cores for resampling.
  Pyresample supports masked arrays.
  .
- This package contains the test suite (and related data) for pyresample.
+ This package contains the test data for pyresample.
diff --git a/debian/python-pyresample-test.install b/debian/python-pyresample-test.install
index d3a1191..98aa2df 100644
--- a/debian/python-pyresample-test.install
+++ b/debian/python-pyresample-test.install
@@ -1,2 +1 @@
-pyresample/test/* usr/share/python-pyresample-test
-
+pyresample/test/test_files/* usr/share/python-pyresample-test/test_files
diff --git a/debian/python-pyresample.links b/debian/python-pyresample.links
new file mode 100644
index 0000000..4ec2483
--- /dev/null
+++ b/debian/python-pyresample.links
@@ -0,0 +1 @@
+usr/share/python-pyresample-test/test_files usr/lib/python2.7/dist-packages/pyresample/test/test_files
diff --git a/debian/python3-pyresample.links b/debian/python3-pyresample.links
new file mode 100644
index 0000000..741d3c2
--- /dev/null
+++ b/debian/python3-pyresample.links
@@ -0,0 +1 @@
+usr/share/python-pyresample-test/test_files usr/lib/python3/dist-packages/pyresample/test/test_files
diff --git a/debian/tests/python2 b/debian/tests/python2
index 5e409fe..31ca9aa 100755
--- a/debian/tests/python2
+++ b/debian/tests/python2
@@ -8,5 +8,5 @@ cd "$ADTTMP"
 
 for py in $PYS; do
     echo "=== $py ==="
-    $py -m unittest discover -v /usr/share/python-pyresample-test 2>&1
+    $py -m unittest -v pyresample.test 2>&1
 done
diff --git a/debian/tests/python3 b/debian/tests/python3
index 0743fbe..571a35f 100755
--- a/debian/tests/python3
+++ b/debian/tests/python3
@@ -8,5 +8,5 @@ cd "$ADTTMP"
 
 for py in $PYS; do
     echo "=== $py ==="
-    $py -m unittest discover -v /usr/share/python-pyresample-test 2>&1
+    $py -m unittest -v pyresample.test 2>&1
 done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyresample.git