Skip to content

Commit

Permalink
Upgrade pip and setuptools (#2434)
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborbernat committed Oct 25, 2022
1 parent 3cff34f commit b456456
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
py:
- "3.11.0-beta.5"
- "3.11.0-rc.2"
- "3.10"
- "3.9"
- "3.8"
Expand Down
15 changes: 9 additions & 6 deletions .pre-commit-config.yaml
Expand Up @@ -12,27 +12,30 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/asottile/pyupgrade
rev: v2.38.0
rev: v3.1.0
hooks:
- id: pyupgrade
args: ["--py36-plus"]
exclude: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
- repo: https://github.com/asottile/pyupgrade
rev: v2.38.4
hooks:
- id: pyupgrade
files: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 22.8.0
rev: 22.10.0
hooks:
- id: black
args: [--safe]
- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
hooks:
- id: blacken-docs
additional_dependencies: [black==22.6]
additional_dependencies: [black==22.10]
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
hooks:
Expand All @@ -43,7 +46,7 @@ repos:
- id: tox-ini-fmt
args: ["-p", "fix_lint"]
- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.0.0
rev: v2.2.0
hooks:
- id: setup-cfg-fmt
args: [--min-py3-version, "3.6 ", "--max-py-version", "3.10"]
Expand All @@ -52,10 +55,10 @@ repos:
hooks:
- id: flake8
additional_dependencies:
- flake8-bugbear==22.7.1
- flake8-bugbear==22.10.25
- flake8-comprehensions==3.10
- flake8-pytest-style==1.6
- flake8-spellcheck==0.28
- flake8-unused-arguments==0.0.11
- flake8-unused-arguments==0.0.12
- flake8-noqa==1.2.9
- pep8-naming==0.13.2
1 change: 1 addition & 0 deletions docs/changelog/2434.bugfix.rst
@@ -0,0 +1 @@
Upgrade embedded setuptools to ``65.5.0`` from ``65.3.0`` and pip to ``22.3`` from ``22.2.2`` - by :user:`gaborbernat`.
8 changes: 4 additions & 4 deletions setup.cfg
Expand Up @@ -33,7 +33,7 @@ project_urls =
[options]
packages = find:
install_requires =
distlib>=0.3.5,<1
distlib>=0.3.6,<1
filelock>=3.4.1,<4
platformdirs>=2.4,<3
importlib-metadata>=4.8.3;python_version < "3.8"
Expand Down Expand Up @@ -79,10 +79,10 @@ virtualenv.seed =
[options.extras_require]
docs =
proselint>=0.13
sphinx>=5.1.1
sphinx-argparse>=0.3.1
sphinx>=5.3
sphinx-argparse>=0.3.2
sphinx-rtd-theme>=1
towncrier>=21.9
towncrier>=22.8
testing =
coverage>=6.2
coverage-enable-subprocess>=1
Expand Down
2 changes: 1 addition & 1 deletion src/virtualenv/activation/activator.py
Expand Up @@ -22,7 +22,7 @@ def supports(cls, interpreter): # noqa: U100
return True

@classmethod
def add_parser_arguments(cls, parser, interpreter): # noqa: U100
def add_parser_arguments(cls, parser, interpreter): # noqa: U100,B027
"""
Add CLI arguments for this activation script.
Expand Down
20 changes: 10 additions & 10 deletions src/virtualenv/seed/wheels/embed/__init__.py
Expand Up @@ -5,28 +5,28 @@
BUNDLE_FOLDER = Path(__file__).absolute().parent
BUNDLE_SUPPORT = {
"3.11": {
"pip": "pip-22.2.2-py3-none-any.whl",
"setuptools": "setuptools-65.3.0-py3-none-any.whl",
"pip": "pip-22.3-py3-none-any.whl",
"setuptools": "setuptools-65.5.0-py3-none-any.whl",
"wheel": "wheel-0.37.1-py2.py3-none-any.whl",
},
"3.10": {
"pip": "pip-22.2.2-py3-none-any.whl",
"setuptools": "setuptools-65.3.0-py3-none-any.whl",
"pip": "pip-22.3-py3-none-any.whl",
"setuptools": "setuptools-65.5.0-py3-none-any.whl",
"wheel": "wheel-0.37.1-py2.py3-none-any.whl",
},
"3.9": {
"pip": "pip-22.2.2-py3-none-any.whl",
"setuptools": "setuptools-65.3.0-py3-none-any.whl",
"pip": "pip-22.3-py3-none-any.whl",
"setuptools": "setuptools-65.5.0-py3-none-any.whl",
"wheel": "wheel-0.37.1-py2.py3-none-any.whl",
},
"3.8": {
"pip": "pip-22.2.2-py3-none-any.whl",
"setuptools": "setuptools-65.3.0-py3-none-any.whl",
"pip": "pip-22.3-py3-none-any.whl",
"setuptools": "setuptools-65.5.0-py3-none-any.whl",
"wheel": "wheel-0.37.1-py2.py3-none-any.whl",
},
"3.7": {
"pip": "pip-22.2.2-py3-none-any.whl",
"setuptools": "setuptools-65.3.0-py3-none-any.whl",
"pip": "pip-22.3-py3-none-any.whl",
"setuptools": "setuptools-65.5.0-py3-none-any.whl",
"wheel": "wheel-0.37.1-py2.py3-none-any.whl",
},
"3.6": {
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion tasks/update_embedded.py
Expand Up @@ -66,7 +66,7 @@ def handle_file(previous_content, filename, variable_name, previous_encoded):
def report(exit_code, new, next_match, current, script_path):
if new != current:
print("Content updated; overwriting... ", end="")
with open(script_path, "wt") as current_fh:
with open(script_path, "w") as current_fh:
current_fh.write(new)
print("done.")
else:
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Expand Up @@ -113,7 +113,7 @@ passenv =
UPGRADE_ADVISORY
skip_install = true
deps =
black>=22.6
black>=22.10
changedir = {toxinidir}/tasks
commands =
python upgrade_wheels.py
Expand All @@ -124,9 +124,9 @@ passenv =
*
basepython = python3.10
deps =
gitpython>=3.1.27
gitpython>=3.1.29
packaging>=21.3
towncrier>=21.9
towncrier>=22.8
changedir = {toxinidir}/tasks
commands =
python release.py --version {posargs}
Expand Down

0 comments on commit b456456

Please sign in to comment.