[sagenb-export] 01/02: Test against the current python versions, not hard-coded ones

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagenb-export.

commit e64ad79d13dc62f545a4ec1b974965d821b5dbd2
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Aug 25 01:35:27 2017 +0200

    Test against the current python versions, not hard-coded ones
---
 debian/changelog                      |  8 ++++++++
 debian/patches/python-versions-in-tox | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  2 +-
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 71cbdd4..8c19363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sagenb-export (3.2-3) UNRELEASED; urgency=medium
+
+  [ Steve Langasek ]
+  * Test against the current python versions, not hard-coded ones.
+    (Closes: #872878)
+
+ -- Ximin Luo <infinity0 at debian.org>  Fri, 25 Aug 2017 01:32:51 +0200
+
 sagenb-export (3.2-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/patches/python-versions-in-tox b/debian/patches/python-versions-in-tox
new file mode 100644
index 0000000..788dfa4
--- /dev/null
+++ b/debian/patches/python-versions-in-tox
@@ -0,0 +1,30 @@
+Description: test against the current python versions, not hard-coded ones
+ Upstream test suite is testing against python2.7 and python3.5 at
+ build-time.  Fix this to test against 'python' and 'python3' to use
+ whatever the current Debian default is for this release, instead of
+ hard-coding a specific version number.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+
+Index: sagenb-export-3.2/tox.ini
+===================================================================
+--- sagenb-export-3.2.orig/tox.ini
++++ sagenb-export-3.2/tox.ini
+@@ -1,12 +1,12 @@
+ [tox]
+-envlist = py27, py34
++envlist = python, python3
+ 
+-[testenv:py27]
+-commands=python2.7 -m unittest discover
++[testenv:python]
++commands=python -m unittest discover
+ 
+-[testenv:py34]
++[testenv:py3.4]
+ commands=python3.4 -m unittest discover
+ 
+-[testenv:py35]
+-commands=python3.5 -m unittest discover
++[testenv:python3]
++commands=python3 -m unittest discover
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8b640df
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+python-versions-in-tox
diff --git a/debian/rules b/debian/rules
index 51faee0..18d8437 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ export PYBUILD_NAME=sagenb-export
 #	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml        docs/ build/html # HTML generator
 #	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bman        docs/ build/man # Manpage generator
 
-TOX_ENVLIST = py27,py35
+TOX_ENVLIST = python,python3
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb-export.git