[pyorbital] 05/06: New packages for Python 3 and doc

[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 pyorbital.

commit d55e48bb1158e830f5f65a370fef9a0df68455ad
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Oct 30 08:20:28 2016 +0000

    New packages for Python 3 and doc
---
 debian/changelog                                   |  3 ++
 debian/control                                     | 38 +++++++++++++++++++++-
 ...ital.doc-base => python-pyorbital-doc.doc-base} |  4 +--
 debian/python-pyorbital-doc.install                |  1 +
 debian/python-pyorbital.install                    |  1 -
 debian/rules                                       | 13 ++++++--
 debian/tests/control                               |  4 +++
 debian/tests/python3                               | 12 +++++++
 8 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cd1ed7..544a43f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ pyorbital (1.1.0-1) UNRELEASED; urgency=medium
   * Bump standard version to 3.9.8 (no change)
   * debian/copyright
     - fix the URL protocol of the Format field
+  * New package for Python 3
+  * New package for the HTMK documentation (previously included in
+    the python-pyorbital package)
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 30 Oct 2016 07:48:24 +0000
 
diff --git a/debian/control b/debian/control
index 03dfda0..dbd3ae6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,18 @@ Priority: optional
 Build-Depends: debhelper (>= 9.0.0),
                dh-python,
                python-setuptools,
+               python3-setuptools,
                python-all,
+               python3-all,
                python-numpy,
+               python3-numpy,
                python-sphinx
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pyorbital.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pyorbital.git
 Homepage: https://github.com/mraspaud/pyorbital
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: python-pyorbital
 Architecture: all
@@ -21,8 +26,39 @@ Depends: ${shlibs:Depends},
          ${python:Depends},
          ${misc:Depends},
          python-numpy
-Description: Orbital and astronomy computations in Python
+Suggests: python-pyorbital-doc
+Description: Orbital and astronomy computations in Python 2
  Python package for computing orbital parameters from TLE
  files, and making diverse astronomical computations.
  .
  This package is part of the PyTroll toolset.
+ .
+ This is the Python 2 version of the package.
+
+
+Package: python3-pyorbital
+Architecture: all
+Depends: ${shlibs:Depends},
+         ${python3:Depends},
+         ${misc:Depends},
+         python3-numpy
+Suggests: python-pyorbital-doc
+Description: Orbital and astronomy computations in Python 3
+ Python package for computing orbital parameters from TLE
+ files, and making diverse astronomical computations.
+ .
+ This package is part of the PyTroll toolset.
+ .
+ This is the Python 3 version of the package.
+
+Package: python-pyorbital-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends}
+Suggests: www-browser
+Description: Orbital and astronomy computations in Python (documentation)
+ Python package for computing orbital parameters from TLE
+ files, and making diverse astronomical computations.
+ .
+ This package contains the common HTML documentation.
diff --git a/debian/python-pyorbital.doc-base b/debian/python-pyorbital-doc.doc-base
similarity index 64%
rename from debian/python-pyorbital.doc-base
rename to debian/python-pyorbital-doc.doc-base
index 69d280a..c36070c 100644
--- a/debian/python-pyorbital.doc-base
+++ b/debian/python-pyorbital-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: This document includes the
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-pyorbital/html/index.html
-Files: /usr/share/doc/python-pyorbital/html/*.html
+Index: /usr/share/doc/python-pyorbital-doc/html/index.html
+Files: /usr/share/doc/python-pyorbital-doc/html/*.html
diff --git a/debian/python-pyorbital-doc.install b/debian/python-pyorbital-doc.install
new file mode 100644
index 0000000..1396e60
--- /dev/null
+++ b/debian/python-pyorbital-doc.install
@@ -0,0 +1 @@
+doc/build/html usr/share/doc/python-pyorbital-doc
diff --git a/debian/python-pyorbital.install b/debian/python-pyorbital.install
deleted file mode 100644
index 2b6da71..0000000
--- a/debian/python-pyorbital.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/build/html usr/share/doc/python-pyorbital
diff --git a/debian/rules b/debian/rules
index 5c8d18e..7b25b50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,21 @@ export PYBUILD_NAME=pyorbital
 
 
 %:
-	dh $@ --parallel --with python2,sphinxdoc --buildsystem=pybuild
+	dh $@ --parallel --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 
 override_dh_auto_build:
 	dh_auto_build --buildsystem=pybuild
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) -C doc html
+endif
 
 
 override_dh_python2:
-	dh_python2
-	dh_numpy
+	dh_python2 -ppython-pyorbital
+	dh_numpy -ppython-pyorbital
+
+
+override_dh_python3:
+	dh_python3 -ppython3-pyorbital
+	dh_numpy3 -ppython3-pyorbital
diff --git a/debian/tests/control b/debian/tests/control
index 7a37141..06c1786 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,6 @@
 Tests: python2
 Depends: python-pyorbital, python-all
+
+Tests: python3
+Depends: python3-pyorbital, python3-all
+
diff --git a/debian/tests/python3 b/debian/tests/python3
new file mode 100755
index 0000000..5785904
--- /dev/null
+++ b/debian/tests/python3
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -efu
+
+PYS=${PYS:-"$(py3versions -r 2>/dev/null)"}
+TESTPKG=${TESTPKG:-pyorbital}
+
+cd "$ADTTMP"
+
+for py in $PYS; do
+    echo "=== $py ==="
+    $py -m unittest -v pyorbital.tests.suite 2>&1
+done

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