Skip to content

Commit

Permalink
Bump embeded wheels (#2546)
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborbernat committed Apr 19, 2023
1 parent fd7e6fc commit 41cec56
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 26 deletions.
5 changes: 5 additions & 0 deletions docs/changelog/2546.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Upgrade embedded wheels:

* wheel to ``0.40.0`` from ``0.38.4``
* setuptools to ``67.6.1`` from ``67.4.0``
* pip to ``23.1`` from ``23.0.1``
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def setup(app):
root, exe = here.parent, Path(sys.executable)
towncrier = exe.with_name(f"towncrier{exe.suffix}")
cmd = [str(towncrier), "build", "--draft", "--version", "NEXT"]
new = subprocess.check_output(cmd, cwd=root, text=True, stderr=subprocess.DEVNULL)
(root / "docs" / "_draft.rst").write_text("" if "No significant changes" in new else new)
new = subprocess.check_output(cmd, cwd=root, text=True, stderr=subprocess.DEVNULL, encoding="UTF-8")
(root / "docs" / "_draft.rst").write_text("" if "No significant changes" in new else new, encoding="UTF-8")

# the CLI arguments are dynamically generated
doc_tree = Path(app.doctreedir)
Expand Down
36 changes: 18 additions & 18 deletions src/virtualenv/seed/wheels/embed/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
BUNDLE_FOLDER = Path(__file__).absolute().parent
BUNDLE_SUPPORT = {
"3.12": {
"pip": "pip-23.0.1-py3-none-any.whl",
"setuptools": "setuptools-67.4.0-py3-none-any.whl",
"wheel": "wheel-0.38.4-py3-none-any.whl",
"pip": "pip-23.1-py3-none-any.whl",
"setuptools": "setuptools-67.6.1-py3-none-any.whl",
"wheel": "wheel-0.40.0-py3-none-any.whl",
},
"3.11": {
"pip": "pip-23.0.1-py3-none-any.whl",
"setuptools": "setuptools-67.4.0-py3-none-any.whl",
"wheel": "wheel-0.38.4-py3-none-any.whl",
"pip": "pip-23.1-py3-none-any.whl",
"setuptools": "setuptools-67.6.1-py3-none-any.whl",
"wheel": "wheel-0.40.0-py3-none-any.whl",
},
"3.10": {
"pip": "pip-23.0.1-py3-none-any.whl",
"setuptools": "setuptools-67.4.0-py3-none-any.whl",
"wheel": "wheel-0.38.4-py3-none-any.whl",
"pip": "pip-23.1-py3-none-any.whl",
"setuptools": "setuptools-67.6.1-py3-none-any.whl",
"wheel": "wheel-0.40.0-py3-none-any.whl",
},
"3.9": {
"pip": "pip-23.0.1-py3-none-any.whl",
"setuptools": "setuptools-67.4.0-py3-none-any.whl",
"wheel": "wheel-0.38.4-py3-none-any.whl",
"pip": "pip-23.1-py3-none-any.whl",
"setuptools": "setuptools-67.6.1-py3-none-any.whl",
"wheel": "wheel-0.40.0-py3-none-any.whl",
},
"3.8": {
"pip": "pip-23.0.1-py3-none-any.whl",
"setuptools": "setuptools-67.4.0-py3-none-any.whl",
"wheel": "wheel-0.38.4-py3-none-any.whl",
"pip": "pip-23.1-py3-none-any.whl",
"setuptools": "setuptools-67.6.1-py3-none-any.whl",
"wheel": "wheel-0.40.0-py3-none-any.whl",
},
"3.7": {
"pip": "pip-23.0.1-py3-none-any.whl",
"setuptools": "setuptools-67.4.0-py3-none-any.whl",
"wheel": "wheel-0.38.4-py3-none-any.whl",
"pip": "pip-23.1-py3-none-any.whl",
"setuptools": "setuptools-67.6.1-py3-none-any.whl",
"wheel": "wheel-0.40.0-py3-none-any.whl",
},
"3.6": {
"pip": "pip-21.3.1-py3-none-any.whl",
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
18 changes: 12 additions & 6 deletions tasks/upgrade_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,21 @@ def run():
removed = collect_package_versions(remove_packages)

outcome = (1 if STRICT else 0) if (added or removed) else 0
lines = ["Upgrade embedded wheels:", ""]
for key, versions in added.items():
text = f"* upgrade embedded {key} to {fmt_version(versions)}"
text = f"* {key} to {fmt_version(versions)}"
if key in removed:
text += f" from {removed[key]}"
rem = ", ".join(f"``{i}``" for i in removed[key])
text += f" from {rem}"
del removed[key]
print(text)
lines.append(text)
for key, versions in removed.items():
print(f"* removed embedded {key} of {fmt_version(versions)}")

lines.append(f"Removed {key} of {fmt_version(versions)}")
lines.append("")
changelog = "\n".join(lines)
print(changelog)
if len(lines) >= 3:
(Path(__file__).parents[1] / "docs" / "changelog" / "u.bugfix.rst").write_text(changelog, encoding="utf-8")
support_table = OrderedDict((".".join(str(j) for j in i), []) for i in SUPPORT)
for package in sorted(new_batch.keys()):
for folder, version in sorted(folders.items()):
Expand Down Expand Up @@ -112,7 +118,7 @@ def get_embed_wheel(distribution, for_py_version):
""",
)
dest_target = DEST / "__init__.py"
dest_target.write_text(msg)
dest_target.write_text(msg, encoding="utf-8")

subprocess.run([sys.executable, "-m", "black", str(dest_target)])

Expand Down

0 comments on commit 41cec56

Please sign in to comment.