New upstream release (1.3.0).

Stop using an awkward set of patches to tox.ini, and just run tests via
pytest instead.

7 files changed, 16 insertions, 96 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index ef44f03..7ef51fc 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-91fd7f2d48eb3677615942a1bcc688e19b1a0368
-91fd7f2d48eb3677615942a1bcc688e19b1a0368
-f8de55537ac15958a980122b4c72f530be93d06a
-f8de55537ac15958a980122b4c72f530be93d06a
-python-tblib_1.2.0.orig.tar.gz
-bc096fcfec21e9e3e9c1f9d22e88d77739c5a3fb
-21801
+fe522b0c47d430ac13bc4c4c8a091b8cef2085ee
+fe522b0c47d430ac13bc4c4c8a091b8cef2085ee
+fe522b0c47d430ac13bc4c4c8a091b8cef2085ee
+fe522b0c47d430ac13bc4c4c8a091b8cef2085ee
+python-tblib_1.3.0.orig.tar.gz
+a30938cd77d090a10ac13c9901669cdc43b75142
+25295
diff --git a/debian/changelog b/debian/changelog
index 1c71804..a271a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-python-tblib (1.2.0-2) UNRELEASED; urgency=medium
+python-tblib (1.3.0-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
+  * Stop using an awkward set of patches to tox.ini, and just run tests via
+    pytest instead.
   * Use HTTPS for Vcs-* URLs.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 27 Jan 2016 13:37:20 +0000
diff --git a/debian/control b/debian/control
index 8a2798b..e3416cc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Colin Watson <cjwatson@debian.org>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 7.2.11~), dh-python, python (>= 2.6.6-3~), python-all, python3 (>= 3.1.2-8~), python3-all, python-setuptools, python3-setuptools, python-six, python3-six, python-tox
+Build-Depends: debhelper (>= 7.2.11~), dh-python, python (>= 2.6.6-3~), python-all, python3 (>= 3.1.2-8~), python3-all, python-setuptools, python3-setuptools, python-six, python3-six, python-pytest, python3-pytest
 Homepage: https://github.com/ionelmc/python-tblib
 Vcs-Git: https://anonscm.debian.org/git/users/cjwatson/python-tblib.git
 Vcs-Browser: https://anonscm.debian.org/cgit/users/cjwatson/python-tblib.git/
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7654c20..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-tox-sitepackages.patch
-tox-generic.patch
diff --git a/debian/patches/tox-generic.patch b/debian/patches/tox-generic.patch
deleted file mode 100644
index b45318f..0000000
--- a/debian/patches/tox-generic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 91fd7f2d48eb3677615942a1bcc688e19b1a0368 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Fri, 18 Dec 2015 11:31:37 +0000
-Subject: Add {2,3}-{nocov,cover} tox test environments
-
-Forwarded: no
-Last-Update: 2015-12-18
-
-Patch-Name: tox-generic.patch
----
- tox.ini | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/tox.ini b/tox.ini
-index 201b55d..e898fda 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -4,15 +4,17 @@
- envlist =
-     clean,
-     check,
--    {2.6,2.7,3.3,3.4,3.5,pypy}-{cover,nocov},
-+    {2,2.6,2.7,3,3.3,3.4,3.5,pypy}-{cover,nocov},
-     report,
-     docs
- 
- [testenv]
- basepython =
-     pypy: {env:TOXPYTHON:pypy}
-+    2: {env:TOXPYTHON:python}
-     2.6: {env:TOXPYTHON:python2.6}
-     {2.7,docs,spell}: {env:TOXPYTHON:python2.7}
-+    3: {env:TOXPYTHON:python3}
-     3.3: {env:TOXPYTHON:python3.3}
-     3.4: {env:TOXPYTHON:python3.4}
-     3.5: {env:TOXPYTHON:python3.5}
-@@ -102,12 +104,18 @@ skip_install = true
- usedevelop = false
- deps = coverage
- 
-+[testenv:2-nocov]
-+usedevelop = false
-+
- [testenv:2.6-nocov]
- usedevelop = false
- 
- [testenv:2.7-nocov]
- usedevelop = false
- 
-+[testenv:3-nocov]
-+usedevelop = false
-+
- [testenv:3.3-nocov]
- usedevelop = false
- 
diff --git a/debian/patches/tox-sitepackages.patch b/debian/patches/tox-sitepackages.patch
deleted file mode 100644
index f9a6478..0000000
--- a/debian/patches/tox-sitepackages.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 18673302d6f3951580a79d29aafe42fb6759febd Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Tue, 4 Mar 2014 00:06:16 +0000
-Subject: Set sitepackages = True in tox.ini.
-
-This allows tests to run on systems without network access.
-
-Author: Colin Watson <cjwatson@debian.org>
-Forwarded: no
-Last-Update: 2015-12-18
-
-Patch-Name: tox-sitepackages.patch
----
- tox.ini | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tox.ini b/tox.ini
-index 4ca1361..201b55d 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -29,6 +29,7 @@ commands =
-     cover: {posargs:coverage run {toxinidir}/tests/test_tblib.py}
-     nocov: {posargs:{envpython} {toxinidir}/tests/test_tblib.py}
- usedevelop = true
-+sitepackages = True
- 
- [testenv:spell]
- setenv =
diff --git a/debian/rules b/debian/rules
index 7b89f45..fe32ac8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,13 +20,15 @@ override_dh_auto_build:
 	done
 
 override_dh_auto_test:
-	HOME=$(CURDIR) tox -e 2-nocov,3-nocov
+	set -e; for python in $$(pyversions -r) $$(py3versions -r); do \
+		PYTHONPATH=src $$python -m pytest -vv tests README.rst; \
+	done
 
 override_dh_auto_clean:
 	dh_auto_clean
 	find -name \*.pyc -print0 | xargs -0r rm -f
 	find -name __pycache__ -print0 | xargs -0r rm -rf
-	rm -rf build .tox
+	rm -rf build
 	if [ -e debian/backup ]; then \
 		set -e; for x in $(BACKUP); do \
 			cp -a debian/backup/$$x $$x; \