From ed491d0e22f8e2e545f33ffa7a02ca8f3c7be284 Mon Sep 17 00:00:00 2001
From: Yannick Jadoul <yannick.jadoul@belgacom.net>
Date: Sun, 14 Jun 2020 00:37:34 +0200
Subject: [PATCH] Simplify virtualenv test in test_testing

---
 cibuildwheel/linux.py   |  1 -
 cibuildwheel/macos.py   |  1 -
 cibuildwheel/windows.py |  5 +----
 test/test_testing.py    | 13 ++++++++-----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py
index 3a660ef1..0058c2db 100644
--- a/cibuildwheel/linux.py
+++ b/cibuildwheel/linux.py
@@ -200,7 +200,6 @@ def build(options: BuildOptions) -> None:
                             pip install {dependency_install_flags} virtualenv
                             venv_dir=`mktemp -d`/venv
                             python -m virtualenv --no-download "$venv_dir"
-                            export __CIBW_VIRTUALENV_PATH__=$venv_dir
 
                             # run the tests in a subshell to keep that `activate`
                             # script from polluting the env
diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py
index 745c1557..6e895836 100644
--- a/cibuildwheel/macos.py
+++ b/cibuildwheel/macos.py
@@ -224,7 +224,6 @@ def build(options: BuildOptions) -> None:
                 os.path.join(venv_dir, 'bin'),
                 virtualenv_env['PATH'],
             ])
-            virtualenv_env["__CIBW_VIRTUALENV_PATH__"] = venv_dir
 
             # check that we are using the Python from the virtual environment
             call(['which', 'python'], env=virtualenv_env)
diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py
index 9f33ad91..da31b1af 100644
--- a/cibuildwheel/windows.py
+++ b/cibuildwheel/windows.py
@@ -206,13 +206,10 @@ def build(options: BuildOptions) -> None:
             shell(['python', '-m', 'virtualenv', '--no-download', venv_dir], env=env)
 
             virtualenv_env = env.copy()
-
-            venv_script_path = os.path.join(venv_dir, 'Scripts')
             virtualenv_env['PATH'] = os.pathsep.join([
-                venv_script_path,
+                os.path.join(venv_dir, 'Scripts'),
                 virtualenv_env['PATH'],
             ])
-            virtualenv_env["__CIBW_VIRTUALENV_PATH__"] = venv_dir
 
             # check that we are using the Python from the virtual environment
             shell(['which', 'python'], env=virtualenv_env)
diff --git a/test/test_testing.py b/test/test_testing.py
index dda833ea..58a38224 100644
--- a/test/test_testing.py
+++ b/test/test_testing.py
@@ -46,12 +46,15 @@ class TestSpam(TestCase):
         self.assertNotEqual(0, spam.system('python -c "exit(1)"'))
 
     def test_virtualenv(self):
-        virtualenv_path = os.environ.get("__CIBW_VIRTUALENV_PATH__")
-        if not virtualenv_path:
-            self.fail("No virtualenv path defined in environment variable __CIBW_VIRTUALENV_PATH__")
+        # sys.prefix is different from sys.base_prefix when running a virtualenv
+        # See https://docs.python.org/3/library/venv.html, which virtualenv seems
+        # to honor in recent releases
+        # Python 2 doesn't have sys.base_prefix by default
+        if not hasattr(sys, 'base_prefix') or sys.prefix == sys.base_prefix:
+            self.fail("Not running in a virtualenv")
 
-        self.assertTrue(path_contains(virtualenv_path, sys.executable))
-        self.assertTrue(path_contains(virtualenv_path, spam.__file__))
+        self.assertTrue(path_contains(sys.prefix, sys.executable))
+        self.assertTrue(path_contains(sys.prefix, spam.__file__))
 
     def test_uname(self):
         if platform.system() == "Windows":