Skip to content

Commit 2baac9b

Browse files
committed
Merge branch 'doc' into develop
2 parents 7d3046a + 38baf8c commit 2baac9b

25 files changed

+1329
-251
lines changed

.github/workflows/rst-lint.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Check ReST input files
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
- master
7+
pull_request:
8+
jobs:
9+
doc8:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out repository code
13+
uses: actions/checkout@v4
14+
- name: doc8-check
15+
uses: deep-entertainment/doc8-action@v4
16+
with:
17+
scanPaths: "doc/src"

.rtd-require

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
git-props
22
pytest >=3.7.0
33
setuptools
4+
sphinx-copybutton
45
sphinx_rtd_theme

CHANGES.rst

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
Changelog
2+
=========
3+
4+
dev (not yet released)
5+
~~~~~~~~~~~~~~~~~~~~~~
6+
7+
Documentation
8+
-------------
9+
10+
+ `#39`_, `#41`_, `#59`_: Review documentation
11+
12+
Incompatible changes
13+
--------------------
14+
15+
+ Drop support for Python 2.
16+
17+
Bug fixes and minor changes
18+
---------------------------
19+
20+
+ `#40`_: add logging.
21+
+ `#50`_, `#51`_: test suite incompatibility with pytest 6.2.0.
22+
+ `#58`_: declare the type of automark_dependency ini-option correctly
23+
as bool.
24+
25+
Internal
26+
--------
27+
28+
+ `#75`_: review build tool chain.
29+
30+
.. _#39: https://github.com/RKrahl/pytest-dependency/issues/39
31+
.. _#40: https://github.com/RKrahl/pytest-dependency/issues/40
32+
.. _#41: https://github.com/RKrahl/pytest-dependency/issues/41
33+
.. _#50: https://github.com/RKrahl/pytest-dependency/issues/50
34+
.. _#51: https://github.com/RKrahl/pytest-dependency/pull/51
35+
.. _#58: https://github.com/RKrahl/pytest-dependency/pull/58
36+
.. _#59: https://github.com/RKrahl/pytest-dependency/pull/59
37+
.. _#75: https://github.com/RKrahl/pytest-dependency/pull/75
38+
39+
0.5.1 (2020-02-14)
40+
~~~~~~~~~~~~~~~~~~
41+
42+
Bug fixes and minor changes
43+
---------------------------
44+
45+
+ Fix failing documentation build.
46+
47+
0.5.0 (2020-02-14)
48+
~~~~~~~~~~~~~~~~~~
49+
50+
New features
51+
------------
52+
53+
+ `#3`_, `#35`_: add a scope to dependencies.
54+
(Thanks to JoeSc and selenareneephillips!)
55+
56+
Incompatible changes
57+
--------------------
58+
59+
+ Require pytest version 3.7.0 or newer.
60+
61+
Bug fixes and minor changes
62+
---------------------------
63+
64+
+ `#34`_: failing test with pytest 4.2.0 and newer.
65+
66+
+ Use setuptools_scm to manage the version number.
67+
68+
.. _#35: https://github.com/RKrahl/pytest-dependency/pull/35
69+
.. _#34: https://github.com/RKrahl/pytest-dependency/issues/34
70+
.. _#3: https://github.com/RKrahl/pytest-dependency/issues/3
71+
72+
0.4.0 (2018-12-02)
73+
~~~~~~~~~~~~~~~~~~
74+
75+
Incompatible changes
76+
--------------------
77+
78+
+ Require pytest version 3.6.0 or newer. This implicitly drops
79+
support for Python 2.6 and for Python 3.3 and older.
80+
81+
Bug fixes and minor changes
82+
---------------------------
83+
84+
+ `#24`_, `#25`_: get_marker no longer available in pytest 4.0.0.
85+
(Thanks to Rogdham!)
86+
87+
+ `#28`_: Applying markers directly in parametrize is no longer
88+
available in 4.0.
89+
90+
.. _#28: https://github.com/RKrahl/pytest-dependency/issues/28
91+
.. _#25: https://github.com/RKrahl/pytest-dependency/pull/25
92+
.. _#24: https://github.com/RKrahl/pytest-dependency/issues/24
93+
94+
0.3.2 (2018-01-17)
95+
~~~~~~~~~~~~~~~~~~
96+
97+
Bug fixes and minor changes
98+
---------------------------
99+
100+
+ `#5`_: properly register the dependency marker.
101+
102+
+ Do not add the documentation to the source distribution.
103+
104+
.. _#5: https://github.com/RKrahl/pytest-dependency/issues/5
105+
106+
0.3.1 (2017-12-26)
107+
~~~~~~~~~~~~~~~~~~
108+
109+
Bug fixes and minor changes
110+
---------------------------
111+
112+
+ `#17`_: Move the online documentation to Read the Docs.
113+
114+
+ Some improvements in the documentation.
115+
116+
.. _#17: https://github.com/RKrahl/pytest-dependency/issues/17
117+
118+
0.3 (2017-12-26)
119+
~~~~~~~~~~~~~~~~
120+
121+
New features
122+
------------
123+
124+
+ `#7`_: Add a configuration switch to implicitly mark all tests.
125+
126+
+ `#10`_: Add an option to ignore unknown dependencies.
127+
128+
Incompatible changes
129+
--------------------
130+
131+
+ Prepend the class name to the default test name for test class
132+
methods. This fixes a potential name conflict, see `#6`_.
133+
134+
If your code uses test classes and you reference test methods by
135+
their default name, you must add the class name. E.g. if you have
136+
something like:
137+
138+
.. code-block:: python
139+
140+
class TestClass(object):
141+
142+
@pytest.mark.dependency()
143+
def test_a():
144+
pass
145+
146+
@pytest.mark.dependency(depends=["test_a"])
147+
def test_b():
148+
pass
149+
150+
you need to change this to:
151+
152+
.. code-block:: python
153+
154+
class TestClass(object):
155+
156+
@pytest.mark.dependency()
157+
def test_a():
158+
pass
159+
160+
@pytest.mark.dependency(depends=["TestClass::test_a"])
161+
def test_b():
162+
pass
163+
164+
If you override the test name in the :func:`pytest.mark.dependency`
165+
marker, nothing need to be changed.
166+
167+
Bug fixes and minor changes
168+
---------------------------
169+
170+
+ `#11`_: show the name of the skipped test.
171+
(Thanks asteriogonzalez!)
172+
173+
+ `#13`_: Do not import pytest in setup.py to make it compatible with
174+
pipenv.
175+
176+
+ `#15`_: tests fail with pytest 3.3.0.
177+
178+
+ `#8`_: document incompatibility with parallelization in
179+
pytest-xdist.
180+
181+
+ Clarify in the documentation that Python 3.1 is not officially
182+
supported because pytest 2.8 does not support it. There is no known
183+
issue with Python 3.1 though.
184+
185+
.. _#15: https://github.com/RKrahl/pytest-dependency/issues/15
186+
.. _#13: https://github.com/RKrahl/pytest-dependency/issues/13
187+
.. _#11: https://github.com/RKrahl/pytest-dependency/pull/11
188+
.. _#10: https://github.com/RKrahl/pytest-dependency/issues/10
189+
.. _#8: https://github.com/RKrahl/pytest-dependency/issues/8
190+
.. _#7: https://github.com/RKrahl/pytest-dependency/issues/7
191+
.. _#6: https://github.com/RKrahl/pytest-dependency/issues/6
192+
193+
0.2 (2017-05-28)
194+
~~~~~~~~~~~~~~~~
195+
196+
New features
197+
------------
198+
199+
+ `#2`_: Add documentation.
200+
201+
+ `#4`_: Add a depend() function to add a dependency to a test at
202+
runtime.
203+
204+
.. _#4: https://github.com/RKrahl/pytest-dependency/issues/4
205+
.. _#2: https://github.com/RKrahl/pytest-dependency/issues/2
206+
207+
0.1 (2017-01-29)
208+
~~~~~~~~~~~~~~~~
209+
210+
+ Initial release as an independent Python module.
211+
212+
This code was first developed as part of a larger package,
213+
`python-icat`_, at Helmholtz-Zentrum Berlin für Materialien und
214+
Energie.
215+
216+
.. _python-icat: https://github.com/icatproject/python-icat

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
include CHANGES.rst
12
include LICENSE.txt
23
include MANIFEST.in
34
include README.rst

README.rst

Lines changed: 8 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -15,61 +15,10 @@
1515
pytest-dependency – Manage dependencies of tests
1616
================================================
1717

18-
This pytest plugin manages dependencies of tests. It allows to mark
19-
some tests as dependent from other tests. These tests will then be
20-
skipped if any of the dependencies did fail or has been skipped.
21-
22-
23-
Download
24-
--------
25-
26-
The latest release version can be found `at PyPI`__.
27-
28-
.. __: `PyPI site`_
29-
30-
31-
System requirements
32-
-------------------
33-
34-
+ Python 3.4 and newer.
35-
+ `setuptools`_.
36-
+ `pytest`_ 3.7.0 or newer.
37-
38-
Optional library packages:
39-
40-
+ `git-props`_
41-
42-
This package is used to extract some metadata such as the version
43-
number out of git, the version control system. All releases embed
44-
that metadata in the distribution. So this package is only needed
45-
to build out of the plain development source tree as cloned from
46-
GitHub, but not to build a release distribution.
47-
48-
+ `distutils-pytest`_ >= 0.2
49-
50-
Only needed to run the test suite.
51-
52-
53-
Installation
54-
------------
55-
56-
1. Download the sources, unpack, and change into the source directory.
57-
58-
2. Build (optional)::
59-
60-
$ python setup.py build
61-
62-
3. Test (optional)::
63-
64-
$ python setup.py test
65-
66-
4. Install::
67-
68-
$ python setup.py install
69-
70-
The last step might require admin privileges in order to write into
71-
the site-packages directory of your Python installation.
72-
18+
This module is a plugin for the popular Python testing framework
19+
`pytest`_. It manages dependencies of tests: you may mark some tests
20+
as dependent from other tests. These tests will then be skipped if
21+
any of the dependencies did fail or has been skipped.
7322

7423
Documentation
7524
-------------
@@ -87,13 +36,10 @@ Copyright and License
8736

8837
- Copyright 2013–2015
8938
Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
90-
- Copyright 2016–2020 Rolf Krahl
91-
92-
Licensed under the Apache License, Version 2.0 (the "License"); you
93-
may not use this file except in compliance with the License. You may
94-
obtain a copy of the License at
39+
- Copyright 2016–2023 Rolf Krahl
9540

96-
http://www.apache.org/licenses/LICENSE-2.0
41+
Licensed under the `Apache License`_, Version 2.0 (the "License"); you
42+
may not use this file except in compliance with the License.
9743

9844
Unless required by applicable law or agreed to in writing, software
9945
distributed under the License is distributed on an "AS IS" BASIS,
@@ -102,9 +48,6 @@ implied. See the License for the specific language governing
10248
permissions and limitations under the License.
10349

10450

105-
.. _PyPI site: https://pypi.org/project/pytest-dependency/
106-
.. _setuptools: http://pypi.python.org/pypi/setuptools/
10751
.. _pytest: http://pytest.org/
108-
.. _git-props: https://github.com/RKrahl/git-props
109-
.. _distutils-pytest: https://github.com/RKrahl/distutils-pytest
11052
.. _Read the Docs site: https://pytest-dependency.readthedocs.io/
53+
.. _Apache License: https://www.apache.org/licenses/LICENSE-2.0

0 commit comments

Comments
 (0)