[spyder-unittest] 02/08: Drop the patch queue, no longer required

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Sun Sep 10 15:07:53 UTC 2017


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

ghisvail-guest pushed a commit to branch master
in repository spyder-unittest.

commit 98c28dd17edfaf7c3afb2e6f5b821bf7cc7fadd7
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Sep 10 13:56:00 2017 +0100

    Drop the patch queue, no longer required
---
 .../Fix-calls-to-nose-and-pytest-on-Debian.patch   | 41 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 42 deletions(-)

diff --git a/debian/patches/Fix-calls-to-nose-and-pytest-on-Debian.patch b/debian/patches/Fix-calls-to-nose-and-pytest-on-Debian.patch
deleted file mode 100644
index b56a823..0000000
--- a/debian/patches/Fix-calls-to-nose-and-pytest-on-Debian.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Thu, 23 Feb 2017 23:14:16 +0000
-Subject: Fix calls to nose and pytest on Debian
-
----
- spyder_unittest/backend/testrunner.py            | 4 ++--
- spyder_unittest/backend/tests/test_testrunner.py | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/spyder_unittest/backend/testrunner.py b/spyder_unittest/backend/testrunner.py
-index 04d03e7..c215601 100644
---- a/spyder_unittest/backend/testrunner.py
-+++ b/spyder_unittest/backend/testrunner.py
-@@ -124,12 +124,12 @@ class TestRunner(QObject):
-             self.process.setProcessEnvironment(processEnvironment)
- 
-         if framework == 'nose':
--            executable = 'nosetests'
-+            executable = 'nosetests3'
-             p_args = [
-                 '--with-xunit', '--xunit-file={}'.format(self.resultfilename)
-             ]
-         elif framework == 'py.test':
--            executable = 'py.test'
-+            executable = 'py.test-3'
-             p_args = ['--junit-xml', self.resultfilename]
-         else:
-             raise ValueError('Unknown framework')
-diff --git a/spyder_unittest/backend/tests/test_testrunner.py b/spyder_unittest/backend/tests/test_testrunner.py
-index 30e4e88..f0b7953 100644
---- a/spyder_unittest/backend/tests/test_testrunner.py
-+++ b/spyder_unittest/backend/tests/test_testrunner.py
-@@ -43,7 +43,7 @@ def test_testrunner_start(monkeypatch):
-     mock_process.finished.connect.assert_called_once_with(runner.finished)
-     mock_process.setProcessEnvironment.assert_called_once_with(
-         mock_environment)
--    executable_name = 'py.test.exe' if os.name == 'nt' else 'py.test'
-+    executable_name = 'py.test.exe' if os.name == 'nt' else 'py.test-3'
-     mock_process.start.assert_called_once_with(executable_name,
-                                                ['--junit-xml', 'results'])
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6af3dd0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Fix-calls-to-nose-and-pytest-on-Debian.patch

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



More information about the debian-science-commits mailing list