Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump deps and tools #2976

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Expand Up @@ -29,21 +29,21 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 23.1.0
rev: 23.3.0
hooks:
- id: black
args: [--safe]
- repo: https://github.com/asottile/blacken-docs
rev: 1.13.0
hooks:
- id: blacken-docs
additional_dependencies: [black==23.1]
additional_dependencies: [black==23.3]
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.10.0
hooks:
- id: rst-backticks
- repo: https://github.com/tox-dev/tox-ini-fmt
rev: "0.6.1"
rev: "1.0.0"
hooks:
- id: tox-ini-fmt
args: ["-p", "fix"]
Expand All @@ -52,7 +52,7 @@ repos:
hooks:
- id: flake8
additional_dependencies:
- flake8-bugbear==23.3.12
- flake8-bugbear==23.3.23
- flake8-comprehensions==3.11.1
- flake8-pytest-style==1.7.2
- flake8-spellcheck==0.28
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Expand Up @@ -51,18 +51,18 @@ dependencies = [
"cachetools>=5.3",
"chardet>=5.1",
"colorama>=0.4.6",
"filelock>=3.10",
"filelock>=3.10.7",
'importlib-metadata>=6.1; python_version < "3.8"',
"packaging>=23",
"platformdirs>=3.1.1",
"platformdirs>=3.2",
"pluggy>=1",
"pyproject-api>=1.5.1",
'tomli>=2.0.1; python_version < "3.11"',
'typing-extensions>=4.5; python_version < "3.8"',
"virtualenv>=20.21",
]
optional-dependencies.docs = [
"furo>=2022.12.7",
"furo>=2023.3.27",
"sphinx>=6.1.3",
"sphinx-argparse-cli>=1.11",
"sphinx-autodoc-typehints!=1.23.4,>=1.22",
Expand Down
20 changes: 10 additions & 10 deletions tox.ini
@@ -1,4 +1,5 @@
[tox]
minversion = 3.22
envlist =
fix
py311
Expand All @@ -12,18 +13,19 @@ envlist =
pkg_meta
isolated_build = true
skip_missing_interpreters = true
minversion = 3.22

[testenv]
description = run the tests with pytest under {envname}
package = wheel
wheel_build_env = .pkg
extras =
testing
passenv =
PYTEST_*
SSL_CERT_FILE
setenv =
COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}{/}.coverage.{envname}}
COVERAGE_PROCESS_START = {toxinidir}{/}pyproject.toml
extras =
testing
commands =
pytest {posargs: \
--junitxml {toxworkdir}{/}junit.{envname}.xml --cov {envsitepackagesdir}{/}tox --cov {toxinidir}{/}tests \
Expand All @@ -33,17 +35,15 @@ commands =
-n={env:PYTEST_XDIST_AUTO_NUM_WORKERS:auto} \
tests --durations 5 --run-integration}
diff-cover --compare-branch {env:DIFF_AGAINST:origin/main} {toxworkdir}{/}coverage.{envname}.xml
package = wheel
wheel_build_env = .pkg

[testenv:fix]
description = format the code base to adhere to our styles, and complain about what we cannot do automatically
skip_install = true
deps =
pre-commit>=3.2.1
passenv =
{[testenv]passenv}
PROGRAMDATA
skip_install = true
deps =
pre-commit>=3.2
commands =
pre-commit run --all-files --show-diff-on-failure {posargs}
python -c 'print(r"hint: run {envbindir}{/}pre-commit install to add checks as pre-commit hook")'
Expand All @@ -52,8 +52,8 @@ commands =
description = run type check on code base
deps =
mypy==1.1.1
types-cachetools>=5.3.0.4
types-chardet>=5.0.4.2
types-cachetools>=5.3.0.5
types-chardet>=5.0.4.3
commands =
mypy src/tox
mypy tests
Expand Down