Skip to content

Commit 0a3d578

Browse files
authored
Bump deps and tools (#2954)
1 parent f41c2cd commit 0a3d578

File tree

9 files changed

+34
-33
lines changed

9 files changed

+34
-33
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ repos:
5252
hooks:
5353
- id: flake8
5454
additional_dependencies:
55-
- flake8-bugbear==23.1.20
56-
- flake8-comprehensions==3.10.1
57-
- flake8-pytest-style==1.6
55+
- flake8-bugbear==23.3.12
56+
- flake8-comprehensions==3.11.1
57+
- flake8-pytest-style==1.7.2
5858
- flake8-spellcheck==0.28
5959
- flake8-unused-arguments==0.0.13
60-
- flake8-noqa==1.3
60+
- flake8-noqa==1.3.1
6161
- pep8-naming==0.13.3
62-
- flake8-pyproject==1.2.2
62+
- flake8-pyproject==1.2.3
6363
- repo: https://github.com/pre-commit/mirrors-prettier
6464
rev: "v2.7.1"
6565
hooks:

pyproject.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
build-backend = "hatchling.build"
33
requires = [
44
"hatch-vcs>=0.3",
5-
"hatchling>=1.12.2",
5+
"hatchling>=1.13",
66
]
77

88
[project]
@@ -51,15 +51,15 @@ dependencies = [
5151
"cachetools>=5.3",
5252
"chardet>=5.1",
5353
"colorama>=0.4.6",
54-
"filelock>=3.9",
55-
'importlib-metadata>=6; python_version < "3.8"',
54+
"filelock>=3.10",
55+
'importlib-metadata>=6.1; python_version < "3.8"',
5656
"packaging>=23",
57-
"platformdirs>=2.6.2",
57+
"platformdirs>=3.1.1",
5858
"pluggy>=1",
59-
"pyproject-api>=1.5",
59+
"pyproject-api>=1.5.1",
6060
'tomli>=2.0.1; python_version < "3.11"',
61-
'typing-extensions>=4.4; python_version < "3.8"',
62-
"virtualenv>=20.17.1",
61+
'typing-extensions>=4.5; python_version < "3.8"',
62+
"virtualenv>=20.21",
6363
]
6464
optional-dependencies.docs = [
6565
"furo>=2022.12.7",
@@ -73,21 +73,21 @@ optional-dependencies.docs = [
7373
]
7474
optional-dependencies.testing = [
7575
"build[virtualenv]>=0.10",
76-
"covdefaults>=2.2.2",
76+
"covdefaults>=2.3",
7777
"devpi-process>=0.3",
78-
"diff-cover>=7.4",
78+
"diff-cover>=7.5",
7979
"distlib>=0.3.6",
8080
"flaky>=3.7",
8181
"hatch-vcs>=0.3",
82-
"hatchling>=1.12.2",
82+
"hatchling>=1.13",
8383
"psutil>=5.9.4",
84-
"pytest>=7.2.1",
84+
"pytest>=7.2.2",
8585
"pytest-cov>=4",
8686
"pytest-mock>=3.10",
87-
"pytest-xdist>=3.1",
87+
"pytest-xdist>=3.2.1",
8888
"re-assert>=1.1",
8989
'time-machine>=2.9; implementation_name != "pypy"',
90-
"wheel>=0.38.4",
90+
"wheel>=0.40",
9191
]
9292
urls.Documentation = "https://tox.wiki"
9393
urls.Homepage = "http://tox.readthedocs.org"

src/tox/config/cli/parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,11 @@ def add_argument(*a_args: str, of_type: type[Any] | None = None, **a_kwargs: Any
203203
excl.append((e_kwargs, arguments))
204204
res_excl = prev_excl(**kwargs)
205205
prev_add_arg = res_excl.add_argument
206-
res_excl.add_argument = add_argument # type: ignore[assignment]
206+
res_excl.add_argument = add_argument # type: ignore[method-assign]
207207
return res_excl
208208

209209
prev_excl = result.add_mutually_exclusive_group
210-
result.add_mutually_exclusive_group = add_mutually_exclusive_group # type: ignore[assignment]
210+
result.add_mutually_exclusive_group = add_mutually_exclusive_group # type: ignore[method-assign]
211211
excl: list[tuple[dict[str, Any], list[ArgumentArgs]]] = []
212212
self._groups.append((args, kwargs, excl))
213213
return result

src/tox/config/loader/convert.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ def _to_typing(self, raw: T, of_type: type[V], factory: Factory[V]) -> V:
7171
elif origin == Union: # handle Optional values
7272
args: list[type[Any]] = of_type.__args__ # type: ignore[attr-defined]
7373
none = type(None)
74-
if len(args) == 2 and none in args:
74+
if len(args) == 2 and none in args: # type: ignore[comparison-overlap]
7575
if isinstance(raw, str):
7676
raw = raw.strip() # type: ignore[assignment]
7777
if not raw:
7878
result = None
7979
else:
80-
new_type = next(i for i in args if i != none) # pragma: no cover # this will always find a element
80+
new_type = next(i for i in args if i != none) # type: ignore # pragma: no cover
8181
result = self.to(raw, new_type, factory)
8282
elif origin in (Literal, type(Literal)):
8383
choice = of_type.__args__ # type: ignore[attr-defined]

src/tox/pytest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ def matches(pattern: str, text: str, flags: int = 0) -> None:
394394
except ImportError: # pragma: no cover # hard to test
395395
match = re.match(pattern, text, flags)
396396
if match is None:
397-
warnings.warn("install the re-assert PyPI package for bette error message", UserWarning)
397+
warnings.warn("install the re-assert PyPI package for bette error message", UserWarning, stacklevel=1)
398398
assert match
399399
else:
400400
assert Matches(pattern, flags=flags) == text

src/tox/report.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ def new_start(self: Thread) -> None: # need to patch this
4141
self.parent_ident = current_thread().ident # type: ignore[attr-defined]
4242
old_start(self)
4343

44-
old_start, Thread.start = Thread.start, new_start # type: ignore[assignment]
44+
old_start, Thread.start = Thread.start, new_start # type: ignore[method-assign]
4545
try:
4646
yield
4747
finally:
48-
Thread.start = old_start # type: ignore[assignment]
48+
Thread.start = old_start # type: ignore[method-assign]
4949

5050
@property
5151
def name(self) -> str:

src/tox/tox_env/python/virtual_env/package/util.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from copy import deepcopy
44
from typing import Optional, Set, cast
55

6-
from packaging.markers import Marker, Op, Value, Variable # type: ignore[attr-defined]
6+
from packaging.markers import Marker, Op, Variable # type: ignore[attr-defined]
77
from packaging.requirements import Requirement
88

99

@@ -72,7 +72,7 @@ def _extract_extra_markers(req: Requirement) -> tuple[Requirement, set[str | Non
7272
return req, cast(Set[Optional[str]], extra_markers) or {None}
7373

7474

75-
def _get_extra(_marker: str | tuple[Variable, Op, Value]) -> str | None:
75+
def _get_extra(_marker: str | tuple[Variable, Op, Variable]) -> str | None:
7676
if isinstance(_marker, tuple) and len(_marker) == 3 and _marker[0].value == "extra" and _marker[1].value == "==":
77-
return cast(str, _marker[2].value)
77+
return _marker[2].value
7878
return None

tox.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ passenv =
4343
PROGRAMDATA
4444
skip_install = true
4545
deps =
46-
pre-commit>=2.21
46+
pre-commit>=3.2
4747
commands =
4848
pre-commit run --all-files --show-diff-on-failure {posargs}
4949
python -c 'print(r"hint: run {envbindir}{/}pre-commit install to add checks as pre-commit hook")'
5050

5151
[testenv:type]
5252
description = run type check on code base
5353
deps =
54-
mypy==0.991
55-
types-cachetools>=5.3
56-
types-chardet>=5.0.4.1
54+
mypy==1.1.1
55+
types-cachetools>=5.3.0.4
56+
types-chardet>=5.0.4.2
5757
commands =
5858
mypy src/tox
5959
mypy tests
@@ -82,7 +82,7 @@ commands =
8282
description = do a release, required posarg of the version number
8383
skip_install = true
8484
deps =
85-
gitpython>=3.1.30
85+
gitpython>=3.1.31
8686
packaging>=23
8787
towncrier>=22.12
8888
commands =

whitelist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ signum
156156
sigterm
157157
skipif
158158
splitter
159+
stacklevel
159160
statemachine
160161
string2lines
161162
stringify

0 commit comments

Comments
 (0)