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 tox to 4.6.0 and remove workarounds to avoid pip 23.1 #1301

Merged
merged 1 commit into from
Jun 5, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/1301.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated tox from 4.5.2 to 4.6.0 and removed the workarounds to avoid pip 23.1.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ dev =
pytest == 7.3.1
pytest-xdist == 3.3.1
setuptools_scm[toml] == 7.1.0
tox == 4.5.2
tox == 4.6.0
docs =
furo == 2023.5.20
pyenchant == 3.2.2
Expand Down
13 changes: 0 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,7 @@ labels =
ci = towncrier-check,docs-lint,pre-commit,py{38,39,310,311,312},coverage-platform
skip_missing_interpreters = True

[pkgenv]
# 2023-04-22 The virtualenv used by Tox has pip 23.1 pinned into it
# This version has a bug on winstore installs of Python, so we
# need to force pip to be updated.
# Can be removed once tox bumps virtualenv >= v20.23.0
download = True

[testenv:pre-commit]
# 2023-04-22 see pkgenv ↑
download = {[pkgenv]download}
skip_install = True
deps = build
commands_pre = python -m install_requirement --extra dev --project-root "{tox_root}" pre-commit
Expand All @@ -34,8 +25,6 @@ use_develop = fast: True
passenv = LOCALAPPDATA
setenv = COVERAGE_FILE = {env:COVERAGE_FILE:.coverage}
extras = dev
# 2023-04-22 see pkgenv ↑
download = {[pkgenv]download}
commands =
!fast : python -m coverage run -m pytest {posargs:-vv --color yes}
fast : python -m pytest {posargs:-vv --color yes -n auto}
Expand All @@ -52,8 +41,6 @@ base_python =
coverage310: py310
coverage311: py311
coverage312: py312
# 2023-04-22 see pkgenv ↑
download = {[pkgenv]download}
passenv = COVERAGE_FILE
setenv =
keep: COMBINE_FLAGS = --keep
Expand Down