feat: support pypa build

Author: henryiii

cibuildwheel/__main__.py

@@ -131,6 +131,7 @@ def main() -> None:
         repair_command_default = ''
 
     build_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '')
+    pypa_build = os.environ.get('CIBW_PYPA_BUILD', '0')
     environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform, default='')
     before_all = get_option_from_environment('CIBW_BEFORE_ALL', platform=platform, default='')
     before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform)
@@ -231,6 +232,7 @@ def main() -> None:
         environment=environment,
         dependency_constraints=dependency_constraints,
         manylinux_images=manylinux_images,
+        pypa_build=bool(pypa_build),
     )
 
     # Python is buffering by default when running on the CI platforms, giving problems interleaving subprocess call output with unflushed calls to 'print'

cibuildwheel/linux.py

@@ -161,16 +161,15 @@ def build(options: BuildOptions) -> None:
 
                     env = options.environment.as_dictionary(env, executor=docker.environment_executor)
 
-                    # check config python and pip are still on PATH
+                    # check config python is still on PATH
                     which_python = docker.call(['which', 'python'], env=env, capture_output=True).strip()
                     if PurePath(which_python) != python_bin / 'python':
                         print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
                         exit(1)
 
-                    which_pip = docker.call(['which', 'pip'], env=env, capture_output=True).strip()
-                    if PurePath(which_pip) != python_bin / 'pip':
-                        print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr)
-                        exit(1)
+                    # TODO: ideally should be preinstalled. Don't include a version so that it won't change if already installed
+                    if options.pypa_build:
+                        docker.call(['python', '-m', 'pip', 'install', 'build'], env=env)
 
                     if options.before_build:
                         log.step('Running before_build...')
@@ -184,13 +183,26 @@ def build(options: BuildOptions) -> None:
                     docker.call(['rm', '-rf', built_wheel_dir])
                     docker.call(['mkdir', '-p', built_wheel_dir])
 
-                    docker.call([
-                        'pip', 'wheel',
-                        container_package_dir,
-                        '-w', built_wheel_dir,
-                        '--no-deps',
-                        *get_build_verbosity_extra_flags(options.build_verbosity)
-                    ], env=env)
+                    verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
+
+                    if options.pypa_build:
+                        config_setting = " ".join(verbosity_flags)
+                        docker.call([
+                            'python', '-m', 'build',
+                            container_package_dir,
+                            '--wheel',
+                            '--outdir', built_wheel_dir,
+                            f'--config-setting="{config_setting}"',
+
+                        ], env=env)
+                    else:
+                        docker.call([
+                            'python', '-m', 'pip', 'wheel',
+                            container_package_dir,
+                            '-w', built_wheel_dir,
+                            '--no-deps',
+                            *verbosity_flags,
+                        ], env=env)
 
                     built_wheel = docker.glob(built_wheel_dir, '*.whl')[0]
 

cibuildwheel/macos.py

@@ -126,9 +126,13 @@ def install_pypy(version: str, url: str) -> Path:
     return installation_bin_path
 
 
-def setup_python(python_configuration: PythonConfiguration,
-                 dependency_constraint_flags: Sequence[PathOrStr],
-                 environment: ParsedEnvironment) -> Dict[str, str]:
+def setup_python(
+    python_configuration: PythonConfiguration,
+    dependency_constraint_flags: Sequence[PathOrStr],
+    environment: ParsedEnvironment,
+    pypa_build: bool,
+) -> Dict[str, str]:
+
     implementation_id = python_configuration.identifier.split("-")[0]
     log.step(f'Installing Python {implementation_id}...')
 
@@ -188,7 +192,10 @@ def setup_python(python_configuration: PythonConfiguration,
         env.setdefault('ARCHFLAGS', '-arch x86_64')
 
     log.step('Installing build tools...')
-    call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate', *dependency_constraint_flags], env=env)
+    if pypa_build:
+        call(['pip', 'install', '--upgrade', 'delocate', 'build', *dependency_constraint_flags], env=env)
+    else:
+        call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate', *dependency_constraint_flags], env=env)
 
     return env
 
@@ -218,7 +225,7 @@ def build(options: BuildOptions) -> None:
                     '-c', options.dependency_constraints.get_for_python_version(config.version)
                 ]
 
-            env = setup_python(config, dependency_constraint_flags, options.environment)
+            env = setup_python(config, dependency_constraint_flags, options.environment, options.pypa_build)
 
             if options.before_build:
                 log.step('Running before_build...')
@@ -230,15 +237,27 @@ def build(options: BuildOptions) -> None:
                 shutil.rmtree(built_wheel_dir)
             built_wheel_dir.mkdir(parents=True)
 
-            # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
-            # see https://github.com/joerick/cibuildwheel/pull/369
-            call([
-                'pip', 'wheel',
-                options.package_dir.resolve(),
-                '-w', built_wheel_dir,
-                '--no-deps',
-                *get_build_verbosity_extra_flags(options.build_verbosity)
-            ], env=env)
+            verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
+
+            if options.pypa_build:
+                config_setting = " ".join(verbosity_flags)
+                call([
+                    'python', '-m', 'build',
+                    options.package_dir,
+                    '--wheel',
+                    '--outdir', built_wheel_dir,
+                    f'--config-setting="{config_setting}"',
+                ], env=env)
+            else:
+                # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
+                # see https://github.com/joerick/cibuildwheel/pull/369
+                call([
+                    'pip', 'wheel',
+                    options.package_dir.resolve(),
+                    '-w', built_wheel_dir,
+                    '--no-deps',
+                    *get_build_verbosity_extra_flags(options.build_verbosity)
+                ], env=env)
 
             built_wheel = next(built_wheel_dir.glob('*.whl'))
 

cibuildwheel/resources/constraints-python27.txt

@@ -6,6 +6,8 @@
 #
 appdirs==1.4.4
     # via virtualenv
+build==0.1.0
+    # via -r cibuildwheel/resources/constraints.in
 configparser==4.0.2
     # via importlib-metadata
 contextlib2==0.6.0.post1
@@ -19,14 +21,23 @@ distlib==0.3.1
 filelock==3.0.12
     # via virtualenv
 importlib-metadata==2.1.1
-    # via virtualenv
+    # via
+    #   build
+    #   pep517
+    #   virtualenv
 importlib-resources==3.3.1
     # via virtualenv
+packaging==20.8
+    # via build
 pathlib2==2.3.5
     # via
     #   importlib-metadata
     #   importlib-resources
     #   virtualenv
+pep517==0.9.1
+    # via build
+pyparsing==2.4.7
+    # via packaging
 scandir==1.10.0
     # via pathlib2
 singledispatch==3.4.0.3
@@ -35,10 +46,18 @@ six==1.15.0
     # via
     #   pathlib2
     #   virtualenv
+toml==0.10.2
+    # via
+    #   build
+    #   pep517
 typing==3.7.4.3
-    # via importlib-resources
+    # via
+    #   build
+    #   importlib-resources
 virtualenv==20.2.2
-    # via -r cibuildwheel/resources/constraints.in
+    # via
+    #   -r cibuildwheel/resources/constraints.in
+    #   build
 wheel==0.36.2
     # via
     #   -r cibuildwheel/resources/constraints.in
@@ -47,6 +66,7 @@ zipp==1.2.0
     # via
     #   importlib-metadata
     #   importlib-resources
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==20.3.3

cibuildwheel/resources/constraints-python35.txt

@@ -6,18 +6,33 @@
 #
 appdirs==1.4.4
     # via virtualenv
+build==0.1.0
+    # via -r cibuildwheel/resources/constraints.in
 delocate==0.8.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
 importlib-metadata==2.1.1
-    # via virtualenv
+    # via
+    #   build
+    #   pep517
+    #   virtualenv
 importlib-resources==3.2.1
     # via virtualenv
+packaging==20.8
+    # via build
+pep517==0.9.1
+    # via build
+pyparsing==2.4.7
+    # via packaging
 six==1.15.0
     # via virtualenv
+toml==0.10.2
+    # via
+    #   build
+    #   pep517
 virtualenv==20.2.2
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2
@@ -28,6 +43,7 @@ zipp==1.2.0
     # via
     #   importlib-metadata
     #   importlib-resources
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==20.3.3

cibuildwheel/resources/constraints-python36.txt

@@ -6,18 +6,33 @@
 #
 appdirs==1.4.4
     # via virtualenv
+build==0.1.0
+    # via -r cibuildwheel/resources/constraints.in
 delocate==0.8.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
 importlib-metadata==3.3.0
-    # via virtualenv
+    # via
+    #   build
+    #   pep517
+    #   virtualenv
 importlib-resources==4.1.1
     # via virtualenv
+packaging==20.8
+    # via build
+pep517==0.9.1
+    # via build
+pyparsing==2.4.7
+    # via packaging
 six==1.15.0
     # via virtualenv
+toml==0.10.2
+    # via
+    #   build
+    #   pep517
 typing-extensions==3.7.4.3
     # via importlib-metadata
 virtualenv==20.2.2
@@ -30,6 +45,7 @@ zipp==3.4.0
     # via
     #   importlib-metadata
     #   importlib-resources
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==20.3.3

cibuildwheel/resources/constraints-python37.txt

@@ -6,16 +6,31 @@
 #
 appdirs==1.4.4
     # via virtualenv
+build==0.1.0
+    # via -r cibuildwheel/resources/constraints.in
 delocate==0.8.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
 importlib-metadata==3.3.0
-    # via virtualenv
+    # via
+    #   build
+    #   pep517
+    #   virtualenv
+packaging==20.8
+    # via build
+pep517==0.9.1
+    # via build
+pyparsing==2.4.7
+    # via packaging
 six==1.15.0
     # via virtualenv
+toml==0.10.2
+    # via
+    #   build
+    #   pep517
 typing-extensions==3.7.4.3
     # via importlib-metadata
 virtualenv==20.2.2
@@ -25,7 +40,9 @@ wheel==0.36.2
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
 zipp==3.4.0
-    # via importlib-metadata
+    # via
+    #   importlib-metadata
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==20.3.3

cibuildwheel/resources/constraints-python38.txt

@@ -6,14 +6,26 @@
 #
 appdirs==1.4.4
     # via virtualenv
+build==0.1.0
+    # via -r cibuildwheel/resources/constraints.in
 delocate==0.8.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
+packaging==20.8
+    # via build
+pep517==0.9.1
+    # via build
+pyparsing==2.4.7
+    # via packaging
 six==1.15.0
     # via virtualenv
+toml==0.10.2
+    # via
+    #   build
+    #   pep517
 virtualenv==20.2.2
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2

cibuildwheel/resources/constraints-python39.txt

@@ -6,14 +6,26 @@
 #
 appdirs==1.4.4
     # via virtualenv
+build==0.1.0
+    # via -r cibuildwheel/resources/constraints.in
 delocate==0.8.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
+packaging==20.8
+    # via build
+pep517==0.9.1
+    # via build
+pyparsing==2.4.7
+    # via packaging
 six==1.15.0
     # via virtualenv
+toml==0.10.2
+    # via
+    #   build
+    #   pep517
 virtualenv==20.2.2
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2