Skip to content
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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 4 additions & 0 deletions docs/changelog/2628.bugfix.rst
Original file line number Diff line number Diff line change
@@ -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+``
2 changes: 1 addition & 1 deletion src/virtualenv/create/creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
6 changes: 3 additions & 3 deletions src/virtualenv/run/plugin/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
22 changes: 11 additions & 11 deletions src/virtualenv/seed/wheels/embed/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/virtualenv/seed/wheels/periodic_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/virtualenv/util/path/_permission.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def make_exe(filename):
mode |= level
filename.chmod(mode)
break
except OSError: # noqa: PERF203
except OSError:
continue


Expand Down
8 changes: 4 additions & 4 deletions tasks/make_zipapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tasks/upgrade_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down