[python-pymeasure] 02/09: Drop patch No-pytest-conftest.patch

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-pymeasure.

commit ad05eae53d86cae1ee12fe1dc40f71d972f93486
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Aug 18 13:24:14 2017 +0100

    Drop patch No-pytest-conftest.patch
    
    Reason: No longer required
    
    Gbp-Dch: Full
---
 debian/patches/No-pytest-conftest.patch | 24 ------------------------
 debian/patches/series                   |  1 -
 2 files changed, 25 deletions(-)

diff --git a/debian/patches/No-pytest-conftest.patch b/debian/patches/No-pytest-conftest.patch
deleted file mode 100644
index 9122a11..0000000
--- a/debian/patches/No-pytest-conftest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sun, 23 Jul 2017 12:18:00 +0100
-Subject: No pytest conftest
-
----
- pymeasure/experiment/tests/test_workers.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/pymeasure/experiment/tests/test_workers.py b/pymeasure/experiment/tests/test_workers.py
-index 2fad5ee..dc474ef 100644
---- a/pymeasure/experiment/tests/test_workers.py
-+++ b/pymeasure/experiment/tests/test_workers.py
-@@ -35,10 +35,7 @@ from pymeasure.experiment.results import Results
- data_path = os.path.join(os.path.dirname(__file__), 'data/procedure_for_testing.py')
- procedure = SourceFileLoader('procedure', data_path).load_module()
- 
--slow = pytest.mark.skipif(
--    not pytest.config.getoption("--runslow"),
--    reason="need --runslow option to run"
--)
-+slow = pytest.mark.skipif("slow")
- 
- 
- def test_procedure():
diff --git a/debian/patches/series b/debian/patches/series
index ffd99ca..b9473fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-No-pytest-conftest.patch
 No-privacy-breach.patch

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