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.

Sign up for GitHub

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

No longer forcibly echo off during windows batch activation #2801

Merged
merged 11 commits into from
Nov 26, 2024
Merged

No longer forcibly echo off during windows batch activation #2801

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3292cce
Upgrade setuptools to 75.5 and wheel to 0.45 (#2800)
gaborbernat Nov 19, 2024
8888025
Format FOR so no parentheses are displayed
wiktorinox Nov 22, 2024
86e6f10
Changes after tox -e fix
wiktorinox Nov 22, 2024
2d33a24
Add changelog
wiktorinox Nov 22, 2024
005fc73
Revert "Changes after tox -e fix"
wiktorinox Nov 22, 2024
344bb95
Try a test for output
wiktorinox Nov 22, 2024
28d4849
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2024
64f7c0b
Add quoting to the activation script
wiktorinox Nov 22, 2024
e2b7569
Silence all commends used to create intermediary script
wiktorinox Nov 22, 2024
2c63d16
Add comment and suppress false positive
wiktorinox Nov 22, 2024
492488a
Merge branch 'main' into fix_echo_on_off_winbatch_activate
gaborbernat Nov 26, 2024
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: 4 additions & 0 deletions docs/changelog/2800.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Upgrade embedded wheels:

* wheel to ``0.45.0`` from ``0.44.0``
* setuptools to ``75.5.0``
1 change: 1 addition & 0 deletions docs/changelog/2801.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
no longer forcibly echo off during windows batch activation
6 changes: 2 additions & 4 deletions src/virtualenv/activation/batch/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
@REM This file is UTF-8 encoded, so we need to update the current code page while executing it
@echo off
@for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do (
@set _OLD_CODEPAGE=%%a
)
@for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do @set _OLD_CODEPAGE=%%a

@if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" 65001 > nul
)
Expand Down
26 changes: 13 additions & 13 deletions src/virtualenv/seed/wheels/embed/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@
"3.8": {
"pip": "pip-24.3.1-py3-none-any.whl",
"setuptools": "setuptools-75.3.0-py3-none-any.whl",
"wheel": "wheel-0.44.0-py3-none-any.whl",
"wheel": "wheel-0.45.0-py3-none-any.whl",
},
"3.9": {
"pip": "pip-24.3.1-py3-none-any.whl",
"setuptools": "setuptools-75.3.0-py3-none-any.whl",
"wheel": "wheel-0.44.0-py3-none-any.whl",
"setuptools": "setuptools-75.5.0-py3-none-any.whl",
"wheel": "wheel-0.45.0-py3-none-any.whl",
},
"3.10": {
"pip": "pip-24.3.1-py3-none-any.whl",
"setuptools": "setuptools-75.3.0-py3-none-any.whl",
"wheel": "wheel-0.44.0-py3-none-any.whl",
"setuptools": "setuptools-75.5.0-py3-none-any.whl",
"wheel": "wheel-0.45.0-py3-none-any.whl",
},
"3.11": {
"pip": "pip-24.3.1-py3-none-any.whl",
"setuptools": "setuptools-75.3.0-py3-none-any.whl",
"wheel": "wheel-0.44.0-py3-none-any.whl",
"setuptools": "setuptools-75.5.0-py3-none-any.whl",
"wheel": "wheel-0.45.0-py3-none-any.whl",
},
"3.12": {
"pip": "pip-24.3.1-py3-none-any.whl",
"setuptools": "setuptools-75.3.0-py3-none-any.whl",
"wheel": "wheel-0.44.0-py3-none-any.whl",
"setuptools": "setuptools-75.5.0-py3-none-any.whl",
"wheel": "wheel-0.45.0-py3-none-any.whl",
},
"3.13": {
"pip": "pip-24.3.1-py3-none-any.whl",
"setuptools": "setuptools-75.3.0-py3-none-any.whl",
"wheel": "wheel-0.44.0-py3-none-any.whl",
"setuptools": "setuptools-75.5.0-py3-none-any.whl",
"wheel": "wheel-0.45.0-py3-none-any.whl",
},
"3.14": {
"pip": "pip-24.3.1-py3-none-any.whl",
"setuptools": "setuptools-75.3.0-py3-none-any.whl",
"wheel": "wheel-0.44.0-py3-none-any.whl",
"setuptools": "setuptools-75.5.0-py3-none-any.whl",
"wheel": "wheel-0.45.0-py3-none-any.whl",
},
}
MAX = "3.8"
Expand Down
Binary file added src/virtualenv/seed/wheels/embed/setuptools-75.5.0-py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file renamed ...heels/embed/wheel-0.44.0-py3-none-any.whl → ...heels/embed/wheel-0.45.0-py3-none-any.whl
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tasks/update_embedded.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Helper script to rebuild virtualenv.py from virtualenv_support.""" # noqa: EXE002
"""Helper script to rebuild virtualenv.py from virtualenv_support."""

from __future__ import annotations

Expand Down