Skip to content

Commit 2807908

Browse files
RKrahlRKrahl
committed
Merge branch 'develop' into doc
2 parents 235a5d3 + 1e01358 commit 2807908

17 files changed

+144
-133
lines changed

‎.req

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pytest >=3.6.0
1+
pytest >=3.7.0
22
setuptools_scm

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ python:
66
- "3.6"
77
- "3.7"
88
- "3.8"
9+
- "3.9"
910
install: pip install -r .req
1011
script: make test PYTHON=python
1112

‎CHANGES.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ Bug fixes and minor changes
88
---------------------------
99

1010
+ `#40`_: add logging.
11+
+ `#50`_, `#51`_: test suite incompatibility with pytest 6.2.0.
1112

1213
.. _#40: https://github.com/RKrahl/pytest-dependency/issues/40
14+
.. _#50: https://github.com/RKrahl/pytest-dependency/issues/50
15+
.. _#51: https://github.com/RKrahl/pytest-dependency/pull/51
1316

1417
0.5.1 (2020-02-14)
1518
~~~~~~~~~~~~~~~~~~
@@ -28,6 +31,11 @@ New features
2831
+ `#3`_, `#35`_: add a scope to dependencies.
2932
(Thanks to JoeSc and selenareneephillips!)
3033

34+
Incompatible changes
35+
--------------------
36+
37+
+ Require pytest version 3.7.0 or newer.
38+
3139
Bug fixes and minor changes
3240
---------------------------
3341

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ System requirements
3333

3434
+ Python 2.7 or 3.4 and newer.
3535
+ `setuptools`_.
36-
+ `pytest`_ 3.6.0 or newer.
36+
+ `pytest`_ 3.7.0 or newer.
3737

3838
Optional library packages:
3939

‎doc/src/configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Configuration file options can be set in the `ini file`.
2121

2222
minversion
2323
This is a builtin configuration option of pytest itself. Since
24-
pytest-dependency requires pytest 3.6.0 or newer, it is recommended
25-
to set this option accordingly, either to 3.6.0 or to a newer
24+
pytest-dependency requires pytest 3.7.0 or newer, it is recommended
25+
to set this option accordingly, either to 3.7.0 or to a newer
2626
version, if required by your test code.
2727

2828
automark_dependency

‎doc/src/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ System requirements
66

77
+ Python 2.7 or 3.4 and newer.
88
+ `setuptools`_.
9-
+ `pytest`_ 3.6.0 or newer.
9+
+ `pytest`_ 3.7.0 or newer.
1010

1111

1212
.. _install-other-packages:

‎setup.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
skipped if any of the dependencies did fail or has been skipped.
77
"""
88

9-
from distutils.cmd import Command as du_cmd
10-
import distutils.command.sdist
11-
import distutils.log
129
import os
1310
import os.path
1411
import re
1512
import stat
1613
import string
14+
import setuptools
15+
from distutils.cmd import Command as du_cmd
16+
import distutils.command.sdist
17+
import distutils.log
1718
from setuptools import setup
1819
import setuptools.command.build_py
1920
try:
@@ -90,7 +91,7 @@ class sdist(copy_file_mixin, distutils.command.sdist.sdist):
9091
'Source Code': 'https://github.com/RKrahl/pytest-dependency',
9192
},
9293
py_modules=['pytest_dependency'],
93-
install_requires=['pytest >= 3.6.0'],
94+
install_requires=['pytest >= 3.7.0'],
9495
classifiers=[
9596
'Development Status :: 4 - Beta',
9697
'Framework :: Pytest',
@@ -105,6 +106,7 @@ class sdist(copy_file_mixin, distutils.command.sdist.sdist):
105106
'Programming Language :: Python :: 3.6',
106107
'Programming Language :: Python :: 3.7',
107108
'Programming Language :: Python :: 3.8',
109+
'Programming Language :: Python :: 3.9',
108110
'Operating System :: OS Independent',
109111
'License :: OSI Approved :: Apache Software License',
110112
],

‎tests/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[pytest]
2-
minversion = 3.6
2+
minversion = 3.7

‎tests/test_02_simple_dependency.py

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ def test_d():
2929
""")
3030
result = ctestdir.runpytest("--verbose")
3131
result.assert_outcomes(passed=3, skipped=1, failed=0)
32-
result.stdout.fnmatch_lines("""
33-
*::test_a SKIPPED
34-
*::test_b PASSED
35-
*::test_c PASSED
36-
*::test_d PASSED
32+
result.stdout.re_match_lines(r"""
33+
.*::test_a SKIPPED(?:\s+\(.*\))?
34+
.*::test_b PASSED
35+
.*::test_c PASSED
36+
.*::test_d PASSED
3737
""")
3838

3939

@@ -62,11 +62,11 @@ def test_d():
6262
""")
6363
result = ctestdir.runpytest("--verbose")
6464
result.assert_outcomes(passed=1, skipped=3, failed=0)
65-
result.stdout.fnmatch_lines("""
66-
*::test_a PASSED
67-
*::test_b SKIPPED
68-
*::test_c SKIPPED
69-
*::test_d SKIPPED
65+
result.stdout.re_match_lines(r"""
66+
.*::test_a PASSED
67+
.*::test_b SKIPPED(?:\s+\(.*\))?
68+
.*::test_c SKIPPED(?:\s+\(.*\))?
69+
.*::test_d SKIPPED(?:\s+\(.*\))?
7070
""")
7171

7272

@@ -95,11 +95,11 @@ def test_d():
9595
""")
9696
result = ctestdir.runpytest("--verbose")
9797
result.assert_outcomes(passed=1, skipped=2, failed=1)
98-
result.stdout.fnmatch_lines("""
99-
*::test_a PASSED
100-
*::test_b FAILED
101-
*::test_c SKIPPED
102-
*::test_d SKIPPED
98+
result.stdout.re_match_lines(r"""
99+
.*::test_a PASSED
100+
.*::test_b FAILED
101+
.*::test_c SKIPPED(?:\s+\(.*\))?
102+
.*::test_d SKIPPED(?:\s+\(.*\))?
103103
""")
104104

105105

@@ -127,11 +127,11 @@ def test_d():
127127
""")
128128
result = ctestdir.runpytest("--verbose")
129129
result.assert_outcomes(passed=1, skipped=2, failed=1)
130-
result.stdout.fnmatch_lines("""
131-
*::test_a PASSED
132-
*::test_b FAILED
133-
*::test_c SKIPPED
134-
*::test_d SKIPPED
130+
result.stdout.re_match_lines(r"""
131+
.*::test_a PASSED
132+
.*::test_b FAILED
133+
.*::test_c SKIPPED(?:\s+\(.*\))?
134+
.*::test_d SKIPPED(?:\s+\(.*\))?
135135
""")
136136

137137

@@ -162,8 +162,8 @@ def test_d():
162162
""")
163163
result = ctestdir.runpytest("--verbose", "test_explicit_select.py::test_d")
164164
result.assert_outcomes(passed=0, skipped=1, failed=0)
165-
result.stdout.fnmatch_lines("""
166-
*::test_d SKIPPED
165+
result.stdout.re_match_lines(r"""
166+
.*::test_d SKIPPED(?:\s+\(.*\))?
167167
""")
168168

169169

@@ -195,9 +195,9 @@ def test_d():
195195
""")
196196
result = ctestdir.runpytest("--verbose")
197197
result.assert_outcomes(passed=3, skipped=1, failed=0)
198-
result.stdout.fnmatch_lines("""
199-
*::test_a PASSED
200-
*::test_b PASSED
201-
*::test_c PASSED
202-
*::test_d SKIPPED
198+
result.stdout.re_match_lines(r"""
199+
.*::test_a PASSED
200+
.*::test_b PASSED
201+
.*::test_c PASSED
202+
.*::test_d SKIPPED(?:\s+\(.*\))?
203203
""")

‎tests/test_03_class.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ def test_e(self):
3636
""")
3737
result = ctestdir.runpytest("--verbose")
3838
result.assert_outcomes(passed=2, skipped=2, failed=1)
39-
result.stdout.fnmatch_lines("""
40-
*::TestClass::test_a FAILED
41-
*::TestClass::test_b PASSED
42-
*::TestClass::test_c SKIPPED
43-
*::TestClass::test_d PASSED
44-
*::TestClass::test_e SKIPPED
39+
result.stdout.re_match_lines(r"""
40+
.*::TestClass::test_a FAILED
41+
.*::TestClass::test_b PASSED
42+
.*::TestClass::test_c SKIPPED(?:\s+\(.*\))?
43+
.*::TestClass::test_d PASSED
44+
.*::TestClass::test_e SKIPPED(?:\s+\(.*\))?
4545
""")
4646

4747

@@ -76,12 +76,12 @@ def test_e(self):
7676
""")
7777
result = ctestdir.runpytest("--verbose")
7878
result.assert_outcomes(passed=2, skipped=2, failed=1)
79-
result.stdout.fnmatch_lines("""
80-
*::TestClassNamed::test_a FAILED
81-
*::TestClassNamed::test_b PASSED
82-
*::TestClassNamed::test_c SKIPPED
83-
*::TestClassNamed::test_d PASSED
84-
*::TestClassNamed::test_e SKIPPED
79+
result.stdout.re_match_lines(r"""
80+
.*::TestClassNamed::test_a FAILED
81+
.*::TestClassNamed::test_b PASSED
82+
.*::TestClassNamed::test_c SKIPPED(?:\s+\(.*\))?
83+
.*::TestClassNamed::test_d PASSED
84+
.*::TestClassNamed::test_e SKIPPED(?:\s+\(.*\))?
8585
""")
8686

8787

@@ -114,8 +114,8 @@ def test_b():
114114
""")
115115
result = ctestdir.runpytest("--verbose")
116116
result.assert_outcomes(passed=1, skipped=1, failed=1)
117-
result.stdout.fnmatch_lines("""
118-
*::test_a FAILED
119-
*::TestClass::test_a PASSED
120-
*::test_b SKIPPED
117+
result.stdout.re_match_lines(r"""
118+
.*::test_a FAILED
119+
.*::TestClass::test_a PASSED
120+
.*::test_b SKIPPED(?:\s+\(.*\))?
121121
""")

0 commit comments

Comments
 (0)