[Python-modules-commits] [sphinx] 01/01: Switch from nose to pytest, following upstream.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository sphinx.

commit f7b4f70b9c9fc2d5c6f3db88b494182d55f44a2d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jan 22 12:31:58 2017 +0300

    Switch from nose to pytest, following upstream.
---
 debian/changelog           | 1 +
 debian/control             | 2 +-
 debian/rules               | 4 ++--
 debian/tests/control       | 4 ++--
 debian/tests/python-sphinx | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 775507d..6795bd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sphinx (1.5.2-1) UNRELEASED; urgency=medium
     - Drop fix_xapian_search.diff, applied upstream.
     - Rebase other patches for test system changes to pytest.
   * Bump python[3]-requests dependency to 2.4.0.
+  * Switch from nose to pytest, following upstream.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 22 Jan 2017 12:13:03 +0300
 
diff --git a/debian/control b/debian/control
index eeeea1d..379e5f2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep: dh-python,
   python-jinja2 (>= 2.3), python3-jinja2 (>= 2.3),
   python-sqlalchemy, python3-sqlalchemy,
   python-whoosh, python3-whoosh,
-  python-nose, python3-nose,
+  python-pytest, python3-pytest,
   python-mock, python3-mock,
   python-babel (>= 1.3), python3-babel (>= 1.3),
   python-alabaster (>= 0.7), python3-alabaster (>= 0.7),
diff --git a/debian/rules b/debian/rules
index 938de30..f789cfc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,9 +60,9 @@ ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
 	export LC_ALL=C.UTF-8 && \
 	set -ex; for py in $(shell pyversions -r) $(shell py3versions -r); do \
 		if [ "$$py" \< "python3.5" ]; then \
-			$$py tests/run.py -m '^test' --verbose -I py35; \
+			$$py tests/run.py --verbose --ignore tests/py35; \
 		else \
-			$$py tests/run.py -m '^test' --verbose; \
+			$$py tests/run.py --verbose; \
 		fi; \
 	done
 	rm -rf build/py2/tests/ build/py3/tests/
diff --git a/debian/tests/control b/debian/tests/control
index b68eb4d..c1b2e25 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,7 +3,7 @@ Depends: python-sphinx,
          python-enum34,
          python-html5lib,
          python-pygments (>= 2.1.1),
-         python-nose,
+         python-pytest,
          python-mock,
          python-xapian,
          python-whoosh,
@@ -18,7 +18,7 @@ Tests: python3-sphinx
 Depends: python3-sphinx,
          python3-html5lib,
          python3-pygments (>= 2.1.1),
-         python3-nose,
+         python3-pytest,
          python3-mock,
          python3-xapian,
          python3-whoosh,
diff --git a/debian/tests/python-sphinx b/debian/tests/python-sphinx
index 50ae6e7..9b70000 100755
--- a/debian/tests/python-sphinx
+++ b/debian/tests/python-sphinx
@@ -5,6 +5,6 @@ cd "$ADTTMP"
 pyversions -i \
 | tr ' ' '\n' \
 | xargs -I {} env PYTHONWARNINGS=d PYTHONHASHSEED=random {} \
-  tests/run.py -m '^test' --verbose -I py35 2>&1
+  tests/run.py --verbose --ignore tests/py35 2>&1
 
 # vim:ts=4 sw=4 et

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git