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

Default prompt of environment name in batch shell #1679

Merged
merged 11 commits into from
Mar 3, 2020
Merged

Default prompt of environment name in batch shell #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
543c7c0
Default prompt of environment name in batch shell
spetafree Feb 27, 2020
199efd0
Handle batch prompt in activate.bat
spetafree Feb 28, 2020
fe3b321
change test folder name to aviod bat escapes
spetafree Mar 2, 2020
093559f
run activation tests with and without prompt
spetafree Mar 2, 2020
dddf7cd
test for correct prompt in batch (only, for now)
spetafree Mar 2, 2020
468ad25
Try to normalize path in batch tests
spetafree Mar 2, 2020
dd1f984
update description
spetafree Mar 2, 2020
191d725
Update 1679.bugfix.rst
gaborbernat Mar 3, 2020
faf0ae3
Update conftest.py
gaborbernat Mar 3, 2020
5fdf31a
Update conftest.py
gaborbernat Mar 3, 2020
6c5fbf2
better names
gaborbernat Mar 3, 2020
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
1 change: 1 addition & 0 deletions docs/changelog/1679.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix Batch activation script shell prompt to display environment name by default - by :user:`spetafree`.
7 changes: 6 additions & 1 deletion src/virtualenv/activation/batch/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ if defined _OLD_VIRTUAL_PROMPT (
)
)
if not defined VIRTUAL_ENV_DISABLE_PROMPT (
set "PROMPT=__VIRTUAL_PROMPT__%PROMPT%"
set "ENV_PROMPT=__VIRTUAL_PROMPT__"
if NOT DEFINED ENV_PROMPT (
for %%d in ("%VIRTUAL_ENV%") do set "ENV_PROMPT=(%%~nxd) "
)
)
set "PROMPT=%ENV_PROMPT%%PROMPT%"
)

REM Don't use () to avoid problems with them in %PATH%
Expand Down
9 changes: 6 additions & 3 deletions tests/unit/activation/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,13 @@ def raise_on_non_source_class():
return RaiseOnNonSourceCall


@pytest.fixture(scope="session")
def activation_python(tmp_path_factory, special_char_name, current_fastest):
@pytest.fixture(scope="session", params=[True, False], ids=["with_prompt", "no_prompt"])
def activation_python(request, tmp_path_factory, special_char_name, current_fastest):
dest = os.path.join(ensure_text(str(tmp_path_factory.mktemp("activation-tester-env"))), special_char_name)
session = cli_run(["--without-pip", dest, "--prompt", special_char_name, "--creator", current_fastest, "-vv"])
cmd = ["--without-pip", dest, "--creator", current_fastest, "-vv"]
if request.param:
cmd += ["--prompt", special_char_name]
session = cli_run(cmd)
pydoc_test = session.creator.purelib / "pydoc_test.py"
pydoc_test.write_text('"""This is pydoc_test.py"""')
yield session
Expand Down