Skip to content

Commit dc28d81

Browse files
Fix/cleanup remaining Pytest-6 references for Python 2.7
Signed-off-by: Bernhard Kaindl <[email protected]>
1 parent 792b5eb commit dc28d81

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ way to install up-to-date python tools
119119
120120
```bash
121121
python3.11 -m pip install pipx
122-
pipx install tox; pipx install 'pytest<7';pipx install pylint pyright
122+
pipx install tox; pipx install pytest;pipx install pylint pyright
123123
pipx inject pytest pytest-{forked,localftpserver,pythonpath,subprocess,timeout} pyfakefs pytest_httpserver six mock
124124
pipx inject pylint pyfakefs six mock pytest{,_forked,-localftpserver}
125125
```
@@ -185,7 +185,7 @@ yet committed in a Git repository and run only them.
185185
For nicer diffs of dictionaries, arrays and the like, use `pytest-clarity` or `pytest-icdiff`:
186186
187187
```py
188-
pip install "pytest<7" pytest-picked pytest-sugar pytest-clarity # pytest-icdiff
188+
pip install pytest pytest-picked pytest-sugar pytest-clarity # pytest-icdiff
189189
```
190190
191191
To verify or extract the dependencies and extras configured in `pyproject.toml` and `tox.ini`

pytest.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
###############################################################################
22
# Configuration file for pytest:
3-
# Compatibility with pytest 6.x for Python 2.7 has been dropped, needs pytest>7
4-
#
53
# See https://docs.pytest.org for documentation on pytest.
64
###############################################################################
75
[pytest]
6+
minversion = 7.0
87
required_plugins =
98
pytest_httpserver
109
pytest_localftpserver
@@ -26,5 +25,4 @@ log_cli=True
2625
log_cli_level=INFO
2726
#
2827
# Add directory to find the example branding.py (needed by bootloader.py) in ./stubs:
29-
# (Requires pytest >= 7.0.0):
3028
pythonpath=stubs

0 commit comments

Comments
 (0)