Skip to content

Commit f130bf3

Browse files
committed
Update pytest to latest version
1 parent c4fab4c commit f130bf3

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

requirements_dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mock==2.0.0
2-
pytest==3.5.0
2+
pytest~=6.0
33
pytest-flake8
4-
pytest-cov==2.5.1
4+
pytest-cov~=2.12
55
falcon==2.0.0; python_version<"3.0"
66
falcon==3.0.0; python_version>="3.0"
77
flask

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ install_requires =
4040
backports.functools-partialmethod; python_version<"3.0"
4141
tests_require =
4242
mock; python_version<"3.0"
43-
pytest
43+
pytest~=6.0
4444
pytest-flake8
45-
pytest-cov
45+
pytest-cov~=2.12
4646
falcon
4747
flask
4848
responses

tests/conftest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import os
2+
import sys
3+
4+
5+
sys.path.insert(
6+
0,
7+
os.path.abspath(os.path.join(os.path.dirname(__file__), '..')),
8+
)

tests/integration/validation/test_read_only_write_only.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def request_validator(spec):
1919
return RequestValidator(spec)
2020

2121

22-
@pytest.fixture('class')
22+
@pytest.fixture(scope='class')
2323
def spec(factory):
2424
spec_dict = factory.spec_from_file("data/v3.0/read_only_write_only.yaml")
2525
return create_spec(spec_dict)

tests/integration/validation/test_security_override.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def request_validator(spec):
1414
return RequestValidator(spec)
1515

1616

17-
@pytest.fixture('class')
17+
@pytest.fixture(scope='class')
1818
def spec(factory):
1919
spec_dict = factory.spec_from_file("data/v3.0/security_override.yaml")
2020
return create_spec(spec_dict)

tests/unit/unmarshalling/test_unmarshal.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,7 @@ def test_string_format_invalid_value(self, unmarshaller_factory):
302302

303303
with pytest.raises(
304304
FormatterNotFoundError,
305-
message=(
306-
'Formatter not found for custom format'
307-
),
305+
match='Formatter not found for custom format'
308306
):
309307
unmarshaller_factory(schema)(value)
310308

0 commit comments

Comments
 (0)