Skip to content

Commit 7ac38f2

Browse files
tox and pyroject.toml: Cleanup dependencies for outdated python packages
Signed-off-by: Bernhard Kaindl <[email protected]>
1 parent 59b499a commit 7ac38f2

File tree

2 files changed

+5
-26
lines changed

2 files changed

+5
-26
lines changed

pyproject.toml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ dependencies = [
3939
# Info: xcp imports branding, but branding has no distribution, so we can't list it.
4040
# A stub for testing is in ./stubs, which we configure to be in PYTHONPATH by pytest.
4141
"six",
42-
"configparser; python_version < '3.0'",
43-
"pyliblzma; python_version < '3.0'"
4442
]
4543

4644
[project.optional-dependencies]
@@ -50,10 +48,9 @@ test = [
5048
"pytest>=7",
5149
"pytest-cov",
5250
"pytest-forked",
53-
"pytest_httpserver; python_version >= '3.7'",
54-
"pytest-localftpserver; python_version >= '3.7'",
55-
"pytest-localftpserver==0.5.1; python_version <= '3.6'",
56-
"pytest-subprocess; python_version >= '3.6'",
51+
"pytest_httpserver",
52+
"pytest-localftpserver",
53+
"pytest-subprocess",
5754
"pytest-timeout",
5855
"typing_extensions"
5956
]
@@ -75,16 +72,7 @@ pytype = [
7572
"pytype",
7673
]
7774
tox = [
78-
# The latest versions of tox need 'py>=1.11.0' and this is not stated in the deps of tox-4.5.1.
79-
"py>=1.11.0",
80-
# Use tox==4.5.1: tox>=4 is needed for reading the extras from pyproject.toml
81-
# while tox>=4.5.2 depends on virutalenv>=20.23, which breaks Python 2.7:
82-
"tox==4.5.1; python_version >= '3.7'",
83-
"tox-gh-actions; python_version >= '3.7'",
84-
# virtualenv-20.22 breaks using python2.7 for the `py27` virtualenv with tox and newer
85-
# versions even break py36(which is also EOL) because py36 does not support
86-
# from __future__ import annotations
87-
"virtualenv<20.22",
75+
"tox-gh-actions",
8876
]
8977

9078
[project.urls]

tox.ini

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@ envlist = py311-covcp-check-mdreport, py312-cov-pytype, py313-cov-lint-pyright
1515
isolated_build = true
1616
skip_missing_interpreters = true
1717
requires =
18-
# The latest versions of tox need 'py>=1.11.0' and this is not stated in the deps of tox-4.5.1.
19-
py>=1.11.0
20-
# Use tox==4.5.1: tox>=4 is needed for reading the extras from pyproject.toml
21-
# while tox>=4.5.2 depends on virutalenv>=20.23, which breaks Python 2.7:
22-
tox==4.5.1; python_version >= '3.7'
23-
tox-gh-actions; python_version >= '3.7'
24-
# virtualenv-20.22 breaks using python2.7 for the `py27` virtualenv with tox and newer
25-
# versions even break py36(which is also EOL) because py36 does not support
26-
# from __future__ import annotations
27-
virtualenv<20.22
18+
tox-gh-actions
2819

2920
[test]
3021
description = Run pytest in this environment with --cov for use in other stages

0 commit comments

Comments
 (0)