diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 767320b58..a55f58807 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,12 +19,12 @@ repos: - id: pyproject-fmt additional_dependencies: ["tox>=4.8"] - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.1" + rev: "v3.0.2" hooks: - id: prettier args: ["--print-width=120", "--prose-wrap=always"] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.284" + rev: "v0.0.285" hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/docs/changelog/2628.bugfix.rst b/docs/changelog/2628.bugfix.rst new file mode 100644 index 000000000..e062a7963 --- /dev/null +++ b/docs/changelog/2628.bugfix.rst @@ -0,0 +1,4 @@ +Upgrade embedded wheels: + +* setuptools to ``68.1.2`` from ``68.1.0`` on ``3.8+`` +* wheel to ``0.41.2`` from ``0.41.1`` on ``3.7+`` diff --git a/src/virtualenv/create/creator.py b/src/virtualenv/create/creator.py index 06f9d39ba..8ff54166e 100644 --- a/src/virtualenv/create/creator.py +++ b/src/virtualenv/create/creator.py @@ -121,7 +121,7 @@ def non_write_able(dest, value): if trip == char: continue raise ValueError(trip) # noqa: TRY301 - except ValueError: # noqa: PERF203 + except ValueError: refused[char] = None if refused: bad = "".join(refused.keys()) diff --git a/src/virtualenv/run/plugin/base.py b/src/virtualenv/run/plugin/base.py index 71ce5c4f4..16114f60e 100644 --- a/src/virtualenv/run/plugin/base.py +++ b/src/virtualenv/run/plugin/base.py @@ -25,9 +25,9 @@ def entry_points_for(cls, key): @staticmethod def entry_points(): - if PluginLoader._ENTRY_POINTS is None: # noqa: SLF001 - PluginLoader._ENTRY_POINTS = entry_points() # noqa: SLF001 - return PluginLoader._ENTRY_POINTS # noqa: SLF001 + if PluginLoader._ENTRY_POINTS is None: + PluginLoader._ENTRY_POINTS = entry_points() + return PluginLoader._ENTRY_POINTS class ComponentBuilder(PluginLoader): diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py index 0d87e4b28..fcbb35cc4 100644 --- a/src/virtualenv/seed/wheels/embed/__init__.py +++ b/src/virtualenv/seed/wheels/embed/__init__.py @@ -9,32 +9,32 @@ "3.7": { "pip": "pip-23.2.1-py3-none-any.whl", "setuptools": "setuptools-68.0.0-py3-none-any.whl", - "wheel": "wheel-0.41.1-py3-none-any.whl", + "wheel": "wheel-0.41.2-py3-none-any.whl", }, "3.8": { "pip": "pip-23.2.1-py3-none-any.whl", - "setuptools": "setuptools-68.0.0-py3-none-any.whl", - "wheel": "wheel-0.41.1-py3-none-any.whl", + "setuptools": "setuptools-68.1.2-py3-none-any.whl", + "wheel": "wheel-0.41.2-py3-none-any.whl", }, "3.9": { "pip": "pip-23.2.1-py3-none-any.whl", - "setuptools": "setuptools-68.0.0-py3-none-any.whl", - "wheel": "wheel-0.41.1-py3-none-any.whl", + "setuptools": "setuptools-68.1.2-py3-none-any.whl", + "wheel": "wheel-0.41.2-py3-none-any.whl", }, "3.10": { "pip": "pip-23.2.1-py3-none-any.whl", - "setuptools": "setuptools-68.0.0-py3-none-any.whl", - "wheel": "wheel-0.41.1-py3-none-any.whl", + "setuptools": "setuptools-68.1.2-py3-none-any.whl", + "wheel": "wheel-0.41.2-py3-none-any.whl", }, "3.11": { "pip": "pip-23.2.1-py3-none-any.whl", - "setuptools": "setuptools-68.0.0-py3-none-any.whl", - "wheel": "wheel-0.41.1-py3-none-any.whl", + "setuptools": "setuptools-68.1.2-py3-none-any.whl", + "wheel": "wheel-0.41.2-py3-none-any.whl", }, "3.12": { "pip": "pip-23.2.1-py3-none-any.whl", - "setuptools": "setuptools-68.0.0-py3-none-any.whl", - "wheel": "wheel-0.41.1-py3-none-any.whl", + "setuptools": "setuptools-68.1.2-py3-none-any.whl", + "wheel": "wheel-0.41.2-py3-none-any.whl", }, } MAX = "3.7" diff --git a/src/virtualenv/seed/wheels/embed/setuptools-68.1.2-py3-none-any.whl b/src/virtualenv/seed/wheels/embed/setuptools-68.1.2-py3-none-any.whl new file mode 100644 index 000000000..e9fdff1cd Binary files /dev/null and b/src/virtualenv/seed/wheels/embed/setuptools-68.1.2-py3-none-any.whl differ diff --git a/src/virtualenv/seed/wheels/embed/wheel-0.41.1-py3-none-any.whl b/src/virtualenv/seed/wheels/embed/wheel-0.41.2-py3-none-any.whl similarity index 72% rename from src/virtualenv/seed/wheels/embed/wheel-0.41.1-py3-none-any.whl rename to src/virtualenv/seed/wheels/embed/wheel-0.41.2-py3-none-any.whl index 17e32b39a..f2befff47 100644 Binary files a/src/virtualenv/seed/wheels/embed/wheel-0.41.1-py3-none-any.whl and b/src/virtualenv/seed/wheels/embed/wheel-0.41.2-py3-none-any.whl differ diff --git a/src/virtualenv/seed/wheels/periodic_update.py b/src/virtualenv/seed/wheels/periodic_update.py index 3d0239d4d..95937e636 100644 --- a/src/virtualenv/seed/wheels/periodic_update.py +++ b/src/virtualenv/seed/wheels/periodic_update.py @@ -353,7 +353,7 @@ def _pypi_get_distribution_info(distribution): with urlopen(url, context=context) as file_handler: # noqa: S310 content = json.load(file_handler) break - except URLError as exception: # noqa: PERF203 + except URLError as exception: logging.error("failed to access %s because %r", url, exception) # noqa: TRY400 except Exception as exception: # noqa: BLE001 logging.error("failed to access %s because %r", url, exception) # noqa: TRY400 diff --git a/src/virtualenv/util/path/_permission.py b/src/virtualenv/util/path/_permission.py index f3e9b625c..8dcad0ce9 100644 --- a/src/virtualenv/util/path/_permission.py +++ b/src/virtualenv/util/path/_permission.py @@ -14,7 +14,7 @@ def make_exe(filename): mode |= level filename.chmod(mode) break - except OSError: # noqa: PERF203 + except OSError: continue diff --git a/tasks/make_zipapp.py b/tasks/make_zipapp.py index be211c4cb..bc74834e5 100644 --- a/tasks/make_zipapp.py +++ b/tasks/make_zipapp.py @@ -162,7 +162,7 @@ def get_dependencies(whl, version): m for m in markers if isinstance(m, tuple) and len(m) == 3 and m[0].value == "extra" # noqa: PLR2004 ): continue - py_versions = WheelDownloader._marker_at(markers, "python_version") # noqa: SLF001 + py_versions = WheelDownloader._marker_at(markers, "python_version") if py_versions: marker = Marker('python_version < "1"') marker._markers = [ # noqa: SLF001 @@ -173,13 +173,13 @@ def get_dependencies(whl, version): continue deleted = 0 for ver in py_versions: - deleted += WheelDownloader._del_marker_at(markers, ver - deleted) # noqa: SLF001 + deleted += WheelDownloader._del_marker_at(markers, ver - deleted) platforms = [] - platform_positions = WheelDownloader._marker_at(markers, "sys_platform") # noqa: SLF001 + platform_positions = WheelDownloader._marker_at(markers, "sys_platform") deleted = 0 for pos in platform_positions: # can only be ore meaningfully platform = f"{markers[pos][1].value}{markers[pos][2].value}" - deleted += WheelDownloader._del_marker_at(markers, pos - deleted) # noqa: SLF001 + deleted += WheelDownloader._del_marker_at(markers, pos - deleted) platforms.append(platform) if not platforms: platforms.append(None) diff --git a/tasks/upgrade_wheels.py b/tasks/upgrade_wheels.py index daa289424..ee5c15b64 100644 --- a/tasks/upgrade_wheels.py +++ b/tasks/upgrade_wheels.py @@ -120,7 +120,7 @@ def get_embed_wheel(distribution, for_py_version): dest_target = DEST / "__init__.py" dest_target.write_text(msg, encoding="utf-8") - subprocess.run([sys.executable, "-m", "black", str(dest_target)]) # noqa: S603 + subprocess.run([sys.executable, "-m", "black", str(dest_target)], check=False) # noqa: S603 raise SystemExit(outcome)