Skip to content

Commit

Permalink
fix: include VIRTUAL_ENV variable (#1842)
Browse files Browse the repository at this point in the history
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
  • Loading branch information
henryiii authored May 29, 2024
1 parent 4c2ed1e commit c333b13
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions cibuildwheel/linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ def build_in_container(

virtualenv_env = env.copy()
virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}"
virtualenv_env["VIRTUAL_ENV"] = str(venv_dir)

# TODO remove me once virtualenv provides pip>=24.1b1
if config.version == "3.13":
Expand Down
1 change: 1 addition & 0 deletions cibuildwheel/macos.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ def build(options: Options, tmp_path: Path) -> None:
virtualenv_env["PATH"],
]
)
virtualenv_env["VIRTUAL_ENV"] = str(venv_dir)

# check that we are using the Python from the virtual environment
call_with_arch("which", "python", env=virtualenv_env)
Expand Down
1 change: 1 addition & 0 deletions cibuildwheel/pyodide.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ def build(options: Options, tmp_path: Path) -> None:
virtualenv_env["PATH"],
]
)
virtualenv_env["VIRTUAL_ENV"] = str(venv_dir)

# check that we are using the Python from the virtual environment
call("which", "python", env=virtualenv_env)
Expand Down
1 change: 1 addition & 0 deletions cibuildwheel/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@ def virtualenv(
paths = [str(venv_path), str(venv_path / "Scripts")] if IS_WIN else [str(venv_path / "bin")]
env = os.environ.copy()
env["PATH"] = os.pathsep.join([*paths, env["PATH"]])
env["VIRTUAL_ENV"] = str(venv_path)
return env


Expand Down
1 change: 1 addition & 0 deletions cibuildwheel/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@ def build(options: Options, tmp_path: Path) -> None:
virtualenv_env["PATH"],
]
)
virtualenv_env["VIRTUAL_ENV"] = str(venv_dir)

# check that we are using the Python from the virtual environment
call("where", "python", env=virtualenv_env)
Expand Down
1 change: 1 addition & 0 deletions test/test_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def test_virtualenv(self):
self.assertTrue(path_contains(sys.prefix, sys.executable))
self.assertTrue(path_contains(sys.prefix, spam.__file__))
self.assertIn("VIRTUAL_ENV", os.environ)
def test_uname(self):
if platform.system() == "Windows":
Expand Down

0 comments on commit c333b13

Please sign in to comment.