Merge branch 'main' into remove-setuptools-ensurepip

python · pradyunsg · Apr 18, 2023 · Jan 14, 2023 · Jan 14, 2023 · Sep 24, 2022
commit 375b5c67adfa0306a5e68d282f4270600175ada4
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py
@@ -1,10 +1,7 @@
 # gh-91321: Build a basic C++ test extension to check that the Python C API is
 # compatible with C++ and does not emit C++ compiler warnings.
 import os.path
-try:
-    import ssl
-except ImportError:
-    ssl = None
+import shutil
 import sys
 import unittest
 import subprocess
@@ -85,9 +82,16 @@ def run_cmd(operation, cmd):
                    self.fail(
                        f"{operation} failed with exit code {proc.returncode}")

+        cmd = [python, '-X', 'dev',
+               '-m', 'pip', 'install',
+               support.findfile('setuptools-67.6.1-py3-none-any.whl'),
+               support.findfile('wheel-0.40.0-py3-none-any.whl')]
+        run_cmd('Install build dependencies', cmd)
+
        # Build and install the C++ extension
        cmd = [python, '-X', 'dev',
-               '-m', 'pip', 'install', PKG_CPPEXTDATA]
+               '-m', 'pip', 'install', '--no-build-isolation',
+               os.path.abspath(pkg_dir)]
        run_cmd('Install', cmd)

        # Do a reference run. Until we test that running python