launchpad-reviewers team mailing list archive

[Colin Watson <mp+428709@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/git-build-recipe:debian-pytest into git-build-recipe:master.

Commit message:
Switch from nose to pytest

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/git-build-recipe/+git/git-build-recipe/+merge/428709

nose is deprecated, so stop using it in the packaging.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/git-build-recipe:debian-pytest into git-build-recipe:master.

diff --git a/debian/changelog b/debian/changelog
index 674b14e..e7d6df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 git-build-recipe (0.3.7) UNRELEASED; urgency=medium
 
+  [ Debian Janitor ]
   * Use secure copyright file specification URI.
   * Remove unnecessary X-Python{,3}-Version field in debian/control.
 
+  [ Colin Watson ]
+  * Switch from nose to pytest.
+
  -- Debian Janitor <janitor@xxxxxxxxx>  Fri, 20 Dec 2019 13:47:13 +0000
 
 git-build-recipe (0.3.6) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index aeb453f..165655a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: vcs
 Priority: optional
 Maintainer: Colin Watson <cjwatson@xxxxxxxxxx>
 Standards-Version: 3.9.7
-Build-Depends: debhelper (>= 9), dh-python, python3 (>= 3.1.2-8~), python3-setuptools, python3-dateutil, python3-debian, python3-testtools, python3-fixtures, python3-nose, devscripts, git, pristine-tar, quilt
+Build-Depends: debhelper (>= 9), dh-python, python3 (>= 3.1.2-8~), python3-setuptools, python3-dateutil, python3-debian, python3-testtools, python3-fixtures, python3-pytest, devscripts, git, pristine-tar, quilt
 Homepage: https://launchpad.net/git-build-recipe
 Vcs-Git: https://git.launchpad.net/git-build-recipe
 Vcs-Browser: https://git.launchpad.net/git-build-recipe
diff --git a/debian/rules b/debian/rules
index 4a74de8..45685ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,7 @@
 #! /usr/bin/make -f
+
+export PYBUILD_TEST_PYTEST := 1
+
 %:
 	dh $@ --with python3 --buildsystem pybuild