Skip to content

Commit f99073c

Browse files
authored
Bump tools and deps (#2522)
* Bump tools and deps Signed-off-by: Bernát Gábor <[email protected]> * Simplify docs conf Signed-off-by: Bernát Gábor <[email protected]> Signed-off-by: Bernát Gábor <[email protected]>
1 parent c97e0b8 commit f99073c

File tree

9 files changed

+51
-52
lines changed

9 files changed

+51
-52
lines changed

.github/workflows/check.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
py:
20-
- "3.11.0-rc.1"
20+
- "3.11"
2121
- "3.10"
2222
- "3.9"
2323
- "3.8"
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup python for tox
3131
uses: actions/setup-python@v4
3232
with:
33-
python-version: "3.10"
33+
python-version: "3.11"
3434
- uses: actions/checkout@v3
3535
with:
3636
fetch-depth: 0
@@ -81,10 +81,10 @@ jobs:
8181
- uses: actions/checkout@v3
8282
with:
8383
fetch-depth: 0
84-
- name: Setup Python 3.10
84+
- name: Setup Python 3.11
8585
uses: actions/setup-python@v4
8686
with:
87-
python-version: "3.10"
87+
python-version: "3.11"
8888
- name: Install self-tox
8989
run: python -m pip install .
9090
- name: Run check for ${{ matrix.tox_env }}
@@ -100,7 +100,7 @@ jobs:
100100
- name: Setup python to build package
101101
uses: actions/setup-python@v4
102102
with:
103-
python-version: "3.10"
103+
python-version: "3.11"
104104
- name: Install build
105105
run: python -m pip install build
106106
- uses: actions/checkout@v3

.pre-commit-config.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ repos:
1212
- id: end-of-file-fixer
1313
- id: trailing-whitespace
1414
- repo: https://github.com/asottile/add-trailing-comma
15-
rev: v2.2.3
15+
rev: v2.3.0
1616
hooks:
1717
- id: add-trailing-comma
1818
args: [--py36-plus]
1919
- repo: https://github.com/asottile/pyupgrade
20-
rev: v2.37.3
20+
rev: v3.2.0
2121
hooks:
2222
- id: pyupgrade
2323
args: ["--py37-plus"]
@@ -29,15 +29,15 @@ repos:
2929
hooks:
3030
- id: isort
3131
- repo: https://github.com/psf/black
32-
rev: 22.8.0
32+
rev: 22.10.0
3333
hooks:
3434
- id: black
3535
args: [--safe]
3636
- repo: https://github.com/asottile/blacken-docs
3737
rev: v1.12.1
3838
hooks:
3939
- id: blacken-docs
40-
additional_dependencies: [black==22.8]
40+
additional_dependencies: [black==22.10]
4141
- repo: https://github.com/pre-commit/pygrep-hooks
4242
rev: v1.9.0
4343
hooks:
@@ -52,15 +52,15 @@ repos:
5252
hooks:
5353
- id: flake8
5454
additional_dependencies:
55-
- flake8-bugbear==22.8.23
56-
- flake8-comprehensions==3.10
55+
- flake8-bugbear==22.10.27
56+
- flake8-comprehensions==3.10.1
5757
- flake8-pytest-style==1.6
5858
- flake8-spellcheck==0.28
59-
- flake8-unused-arguments==0.0.11
59+
- flake8-unused-arguments==0.0.12
6060
- flake8-noqa==1.2.9
6161
- pep8-naming==0.13.2
6262
- repo: https://github.com/pre-commit/mirrors-prettier
63-
rev: "v2.7.1"
63+
rev: "v3.0.0-alpha.4"
6464
hooks:
6565
- id: prettier
6666
additional_dependencies:
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
version: 2
22
build:
3-
image: latest
4-
formats:
5-
- htmlzip
3+
os: ubuntu-22.04
4+
tools:
5+
python: "3"
66
python:
7-
version: 3.8
87
install:
98
- method: pip
109
path: .
@@ -13,3 +12,4 @@ python:
1312
sphinx:
1413
builder: html
1514
configuration: docs/conf.py
15+
fail_on_warning: true

pyproject.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
build-backend = "hatchling.build"
3-
requires = ["hatchling>=1.8.1", "hatch-vcs>=0.2"]
3+
requires = ["hatchling>=1.11.1", "hatch-vcs>=0.2"]
44

55
[project]
66
name = "tox"
@@ -23,42 +23,42 @@ requires-python = ">=3.7"
2323
dependencies = [
2424
"cachetools>=5.2",
2525
"chardet>=5",
26-
"colorama>=0.4.5",
26+
"colorama>=0.4.6",
2727
"packaging>=21.3",
2828
"platformdirs>=2.5.2",
2929
"pluggy>=1",
30-
"pyproject-api>=0.1.1",
31-
'tomli>=2.0.1;python_version<"3.11"',
32-
"virtualenv>=20.16.5",
33-
'importlib-metadata>=4.12; python_version < "3.8"',
34-
'typing-extensions>=4.3; python_version < "3.8"',
30+
"pyproject-api>=1.1.1",
31+
'tomli>=2.0.1; python_version < "3.11"',
32+
"virtualenv>=20.16.6",
33+
'importlib-metadata>=5; python_version < "3.8"',
34+
'typing-extensions>=4.4; python_version < "3.8"',
3535
]
3636
optional-dependencies.docs = [
37-
"furo>=2022.6.21",
38-
"sphinx>=5.1.1",
37+
"furo>=2022.9.29",
38+
"sphinx>=5.3",
3939
"sphinx-argparse-cli>=1.10",
40-
"sphinx-autodoc-typehints>=1.19.2",
40+
"sphinx-autodoc-typehints>=1.19.4",
4141
"sphinx-copybutton>=0.5",
4242
"sphinx-inline-tabs>=2022.1.2b11",
4343
"sphinxcontrib-towncrier>=0.2.1a0",
4444
"towncrier>=22.8",
4545
]
4646
optional-dependencies.testing = [
4747
"covdefaults>=2.2",
48-
"devpi-client>=6.0.1",
49-
"devpi-server>=6.6",
48+
"devpi-client>=6.0.2",
49+
"devpi-server>=6.7",
5050
"distlib>=0.3.6",
5151
"filelock>=3.8",
5252
"flaky>=3.7",
5353
"hatch-vcs>=0.2",
54-
"hatchling>=1.8.1",
55-
"psutil>=5.9.2",
56-
"pytest>=7.1.3",
57-
"pytest-cov>=3",
58-
"pytest-mock>=3.8.2",
59-
"pytest-xdist>=2.5",
54+
"hatchling>=1.11.1",
55+
"psutil>=5.9.3",
56+
"pytest>=7.2",
57+
"pytest-cov>=4",
58+
"pytest-mock>=3.10",
59+
"pytest-xdist>=3.0.2",
6060
"re-assert>=1.1",
61-
"time-machine>=2.8.1",
61+
"time-machine>=2.8.2",
6262
]
6363
scripts.tox = "tox.run:run"
6464
dynamic = ["version"]

src/tox/config/loader/memory.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import annotations
22

33
from pathlib import Path
4-
from typing import TYPE_CHECKING, Any, Iterator, TypeVar, cast
4+
from typing import TYPE_CHECKING, Any, Iterator
55

66
from tox.config.types import Command, EnvList
77

@@ -11,16 +11,15 @@
1111

1212
if TYPE_CHECKING:
1313
from tox.config.main import Config
14-
T = TypeVar("T")
1514

1615

1716
class MemoryLoader(Loader[Any]):
1817
def __init__(self, **kwargs: Any) -> None:
1918
super().__init__(Section(prefix="<memory>", name=str(id(self))), [])
2019
self.raw: dict[str, Any] = {**kwargs}
2120

22-
def load_raw(self, key: Any, conf: Config | None, env_name: str | None) -> T: # noqa: U100
23-
return cast(T, self.raw[key])
21+
def load_raw(self, key: Any, conf: Config | None, env_name: str | None) -> Any: # noqa: U100
22+
return self.raw[key]
2423

2524
def found_keys(self) -> set[str]:
2625
return set(self.raw.keys())
@@ -34,15 +33,15 @@ def to_str(value: Any) -> str:
3433
return str(value)
3534

3635
@staticmethod
37-
def to_list(value: Any, of_type: type[Any]) -> Iterator[T]: # noqa: U100
36+
def to_list(value: Any, of_type: type[Any]) -> Iterator[Any]: # noqa: U100
3837
return iter(value)
3938

4039
@staticmethod
41-
def to_set(value: Any, of_type: type[Any]) -> Iterator[T]: # noqa: U100
40+
def to_set(value: Any, of_type: type[Any]) -> Iterator[Any]: # noqa: U100
4241
return iter(value)
4342

4443
@staticmethod
45-
def to_dict(value: Any, of_type: tuple[type[Any], type[Any]]) -> Iterator[tuple[T, T]]: # noqa: U100
44+
def to_dict(value: Any, of_type: tuple[type[Any], type[Any]]) -> Iterator[tuple[Any, Any]]: # noqa: U100
4645
return value.items() # type: ignore[no-any-return]
4746

4847
@staticmethod

src/tox/journal/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
def write_journal(path: Path | None, journal: Journal) -> None:
1212
if path is None:
1313
return
14-
with open(path, "wt") as file_handler:
14+
with open(path, "w") as file_handler:
1515
json.dump(journal.content, file_handler, indent=2, ensure_ascii=False)
1616

1717

src/tox/report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def stderr(self) -> TextIOWrapper:
138138
return self._local.out_err[1]
139139

140140
@property # type: ignore[override]
141-
def stream(self) -> IO[str]: # type: ignore[override]
141+
def stream(self) -> IO[str]:
142142
""":return: the current stream to write to (alias for the current standard output)"""
143143
return self.stdout
144144

src/tox/tox_env/api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ def teardown(self) -> None:
243243
finally:
244244
self._run_state["teardown"] = True
245245

246-
def _teardown(self) -> None:
246+
def _teardown(self) -> None: # noqa: B027 # empty abstract base class
247247
pass
248248

249249
def _platform_check(self) -> None:
@@ -270,10 +270,10 @@ def _setup_env(self) -> None:
270270
raise Recreate(f"env type changed from {old} to {conf}")
271271
self._handle_env_tmp_dir()
272272

273-
def _setup_with_env(self) -> None:
273+
def _setup_with_env(self) -> None: # noqa: B027 # empty abstract base class
274274
pass
275275

276-
def _done_with_setup(self) -> None:
276+
def _done_with_setup(self) -> None: # noqa: B027 # empty abstract base class
277277
"""called when setup is done"""
278278

279279
def _handle_env_tmp_dir(self) -> None:

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ description = run type check on code base
5656
setenv =
5757
{tty:MYPY_FORCE_COLOR = 1}
5858
deps =
59-
mypy==0.971
59+
mypy==0.982
6060
types-cachetools>=5.2.1
6161
types-chardet>=5.0.4
6262
commands =
@@ -76,8 +76,8 @@ commands =
7676
description = check that the long description is valid
7777
skip_install = true
7878
deps =
79-
build[virtualenv]>=0.8
80-
check-wheel-contents>=0.3.4
79+
build[virtualenv]>=0.9
80+
check-wheel-contents>=0.4
8181
twine>=4.0.1
8282
commands =
8383
python -m build -o {envtmpdir} -s -w .
@@ -88,7 +88,7 @@ commands =
8888
description = do a release, required posarg of the version number
8989
skip_install = true
9090
deps =
91-
gitpython>=3.1.27
91+
gitpython>=3.1.29
9292
packaging>=21.3
9393
towncrier>=22.8
9494
commands =

0 commit comments

Comments
 (0)