Skip to content

Commit 2cae589

Browse files
RKrahlRKrahl
committed
Merge branch 'develop'
2 parents 7ba3afb + def647e commit 2cae589

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2347
-689
lines changed

‎.github/requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
distutils-pytest
2+
git-props
3+
pytest >=3.7.0
4+
setuptools

‎.github/workflows/publish-to-pypi.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Publish
2+
on:
3+
release:
4+
types:
5+
- published
6+
jobs:
7+
PyPI:
8+
name: publish release to PyPI
9+
runs-on: ubuntu-latest
10+
environment: release
11+
permissions:
12+
id-token: write
13+
env:
14+
SDIST: pytest-dependency-${{ github.event.release.tag_name }}.tar.gz
15+
steps:
16+
- name: Fetch assets
17+
uses: cb80/dlassets@latest
18+
with:
19+
tag: ${{ github.event.release.tag_name }}
20+
to: assets
21+
- name: Check assets
22+
run: |
23+
ls -la assets
24+
- name: Copy distfile to dist directory
25+
run: |
26+
mkdir -p dist
27+
cp -p assets/$SDIST dist
28+
- name: Upload distfile to PyPI
29+
uses: pypa/gh-action-pypi-publish@release/v1

‎.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"

‎.github/workflows/run-tests.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Run Test
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
- master
7+
pull_request:
8+
jobs:
9+
Test:
10+
runs-on: ${{ matrix.os }}
11+
strategy:
12+
matrix:
13+
python-version:
14+
- '3.7'
15+
- '3.8'
16+
- '3.9'
17+
- '3.10'
18+
- '3.11'
19+
- '3.12'
20+
os: [ubuntu-latest]
21+
include:
22+
- python-version: '3.6'
23+
os: ubuntu-20.04
24+
steps:
25+
- name: Check out repository code
26+
uses: actions/checkout@v4
27+
with:
28+
fetch-depth: 0
29+
- name: Set up Python ${{ matrix.python-version }}
30+
uses: actions/setup-python@v4
31+
with:
32+
python-version: ${{ matrix.python-version }}
33+
- name: Install dependencies
34+
run: |
35+
pip install -r .github/requirements.txt
36+
- name: Test with pytest
37+
run: |
38+
python setup.py test

‎.gitignore

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
1-
*.pyc
2-
*~
3-
.cache/
41
__pycache__/
5-
/.version
2+
/.env
63
/MANIFEST
4+
/_meta.py
75
/build/
86
/dist/
9-
/doc/doctest/
10-
/doc/doctrees/
11-
/doc/html/
12-
/doc/latex/
13-
/doc/linkcheck/
14-
/pytest_dependency.egg-info/
15-
/python2_6.patch

‎.readthedocs.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
version: 2
5+
6+
build:
7+
os: ubuntu-22.04
8+
tools:
9+
python: "3.12"
10+
jobs:
11+
post_checkout:
12+
- git fetch --unshallow
13+
post_install:
14+
- python setup.py build
15+
16+
sphinx:
17+
configuration: doc/src/conf.py
18+
19+
python:
20+
install:
21+
- requirements: .rtd-require

‎.rtd-require

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
git-props
2+
pytest >=3.7.0
3+
setuptools
4+
sphinx-copybutton
5+
sphinx_rtd_theme

‎.travis.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎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+
0.6.0 (2023-12-31)
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
include .version
1+
include CHANGES.rst
22
include LICENSE.txt
33
include MANIFEST.in
44
include README.rst
5+
include _meta.py
56
include doc/examples/*.py
67
include tests/conftest.py
78
include tests/pytest.ini

0 commit comments

Comments
 (0)