git-build-recipe

Merge ~cjwatson/git-build-recipe:debian-pytest into git-build-recipe:master

  1. Git
  2. lp:~cjwatson/git-build-recipe
  3. debian-pytest
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Merged at revision: 497a84008d1d3c2afed54ef26b07ec45e90a03de
Proposed branch: ~cjwatson/git-build-recipe:debian-pytest
Merge into: git-build-recipe:master
Diff against target: 41 lines (+8/-1)
3 files modified
debian/changelog (+4/-0)
debian/control (+1/-1)
debian/rules (+3/-0)
Reviewer Review Type Date Requested Status
Andrey Fedoseev (community) Approve
Review via email: mp+428709@code.launchpad.net

Commit message

Switch from nose to pytest

Description of the change

nose is deprecated, so stop using it in the packaging.

To post a comment you must log in.
Revision history for this message
Andrey Fedoseev (andrey-fedoseev) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 674b14e..e7d6df9 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,8 +1,12 @@
6 git-build-recipe (0.3.7) UNRELEASED; urgency=medium
7
8+ [ Debian Janitor ]
9 * Use secure copyright file specification URI.
10 * Remove unnecessary X-Python{,3}-Version field in debian/control.
11
12+ [ Colin Watson ]
13+ * Switch from nose to pytest.
14+
15 -- Debian Janitor <janitor@jelmer.uk> Fri, 20 Dec 2019 13:47:13 +0000
16
17 git-build-recipe (0.3.6) unstable; urgency=medium
18diff --git a/debian/control b/debian/control
19index aeb453f..165655a 100644
20--- a/debian/control
21+++ b/debian/control
22@@ -3,7 +3,7 @@ Section: vcs
23 Priority: optional
24 Maintainer: Colin Watson <cjwatson@ubuntu.com>
25 Standards-Version: 3.9.7
26-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
27+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
28 Homepage: https://launchpad.net/git-build-recipe
29 Vcs-Git: https://git.launchpad.net/git-build-recipe
30 Vcs-Browser: https://git.launchpad.net/git-build-recipe
31diff --git a/debian/rules b/debian/rules
32index 4a74de8..45685ce 100755
33--- a/debian/rules
34+++ b/debian/rules
35@@ -1,4 +1,7 @@
36 #! /usr/bin/make -f
37+
38+export PYBUILD_TEST_PYTEST := 1
39+
40 %:
41 dh $@ --with python3 --buildsystem pybuild
42

Subscribers

People subscribed via source and target branches