Support pytest 4

Fixes https://github.com/kennethreitz/requests/issues/5048 See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
psf · Apr 17, 2019 · 7a33a8e · 7a33a8e
1 parent 9742da7
commit 7a33a8e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Pipfile b/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [dev-packages]
-pytest = ">=2.8.0,<4.1"
+pytest = ">=3"
 codecov = "*"
 pytest-httpbin = ">=0.0.7"
 pytest-mock = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@ def run_tests(self):
     'pytest-mock',
     'pytest-xdist',
     'PySocks>=1.5.6, !=1.5.7',
-    'pytest>=2.8.0'
+    'pytest>=3'
 ]
 
 about = {}

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -33,7 +33,8 @@ class TestSuperLen:
         'stream, value', (
             (StringIO.StringIO, 'Test'),
             (BytesIO, b'Test'),
-            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
+            pytest.param(cStringIO, 'Test',
+                         marks=pytest.mark.skipif('cStringIO is None')),
         ))
     def test_io_streams(self, stream, value):
         """Ensures that we properly deal with different kinds of IO streams."""