ci: make it not complain about pip on windows

Author: delfick

tests/conftest.py

@@ -81,13 +81,15 @@ def normalise_python_location(self, pythons, k):
 
     def make_venv(self, python_exe, version, errors):
         venv_location = self.made_venvs / f"venv{version}"
+        created = False
         if not venv_location.exists():
+            created = True
             PythonHandler().run_command(
                 python_exe,
                 f"""
                 import json
                 import venv
-                venv.create({json.dumps(str(venv_location))}, with_pip=True)
+                venv.create({json.dumps(str(venv_location))}, with_pip=False)
             """,
             )
 
@@ -96,6 +98,9 @@ def make_venv(self, python_exe, version, errors):
         else:
             py = venv_location / "bin" / "python"
 
+        if created:
+            subprocess.run([str(py), "-m", "ensurepip"], check=True)
+
         if not py.exists():
             if errors:
                 if venv_location.exists():

tests/test_creation.py

@@ -8,7 +8,7 @@
 
 describe "Finding the right version":
 
-    @pytest.mark.parametrize("version", [3.6, 3.7, 3.8, 3.9, "3.10"])
+    @pytest.mark.parametrize("version", [3.7, 3.8, 3.9, "3.10"])
     it "will always use current version if no max is specified", version:
 
         def script():
@@ -19,7 +19,7 @@ def script():
             with pytest.helpers.make_script(script, exe=exe, prepare_venv=True) as filename:
                 pytest.helpers.assertPythonVersion(filename, str(version))
 
-    @pytest.mark.parametrize("version", [3.6, 3.7, 3.8, 3.9, "3.10"])
+    @pytest.mark.parametrize("version", [3.7, 3.8, 3.9, "3.10"])
     it "will use the only version available if within min and max", version:
 
         def script(version):

venvstarter.py

@@ -561,14 +561,19 @@ def make_virtualenv(self):
             print(f"Using: {python_exe}", file=sys.stderr)
             print(file=sys.stderr)
 
+            with_pip = os.name != "nt"
+
             PythonHandler().run_command(
                 python_exe,
                 f"""
             import venv
-            venv.create({json.dumps(str(self.venv_location))}, with_pip=True, symlinks=True)
+            venv.create({json.dumps(str(self.venv_location))}, with_pip={with_pip}, symlinks=True)
             """,
             )
 
+            if not with_pip:
+                subprocess.run([str(self.venv_python), "-m", "ensurepip"], check=True)
+
             return True
 
     def check_deps(self):