TST: simplify pep518 test setup

tests/conftest.py

@@ -48,11 +48,11 @@ def in_git_repo_context(path=os.path.curdir):
     path = os.path.abspath(path)
     shutil.rmtree(os.path.join(path, '.git'), ignore_errors=True)
     try:
-        subprocess.check_call(['git', 'init', '-b', 'main', path])
-        subprocess.check_call(['git', 'config', 'user.email', '[email protected]'], cwd=path)
-        subprocess.check_call(['git', 'config', 'user.name', 'A U Thor'], cwd=path)
-        subprocess.check_call(['git', 'add', '*'], cwd=path)
-        subprocess.check_call(['git', 'commit', '-q', '-m', 'Test'], cwd=path)
+        subprocess.run(['git', 'init', '-b', 'main', path], check=True)
+        subprocess.run(['git', 'config', 'user.email', '[email protected]'], cwd=path, check=True)
+        subprocess.run(['git', 'config', 'user.name', 'A U Thor'], cwd=path, check=True)
+        subprocess.run(['git', 'add', '*'], cwd=path, check=True)
+        subprocess.run(['git', 'commit', '-q', '-m', 'Test'], cwd=path, check=True)
         yield
     finally:
         # PermissionError raised on Windows.
@@ -123,50 +123,28 @@ def fixture(tmp_dir_session):
     globals()[f'wheel_{normalized}'] = generate_wheel_fixture(package)
 
 
+@pytest.fixture(autouse=True, scope='session')
+def disable_pip_version_check():
+    # Cannot use the 'monkeypatch' fixture because of scope mismatch.
+    mpatch = pytest.MonkeyPatch()
+    yield mpatch.setenv('PIP_DISABLE_PIP_VERSION_CHECK', '1')
+    mpatch.undo()
+
+
 @pytest.fixture(scope='session')
 def pep518_wheelhouse(tmpdir_factory):
     wheelhouse = tmpdir_factory.mktemp('wheelhouse')
-    dist = tmpdir_factory.mktemp('dist')
-    subprocess.run(
-        [sys.executable, '-m', 'build', '--wheel', '--outdir', str(dist)],
-        cwd=str(package_dir.parent.parent),
-        check=True,
-    )
-    (wheel_path,) = dist.visit('*.whl')
-    subprocess.run(
-        [
-            sys.executable,
-            '-m',
-            'pip',
-            'download',
-            '-q',
-            '-d',
-            str(wheelhouse),
-            str(wheel_path),
-        ],
-        check=True,
-    )
-    subprocess.run(
-        [
-            sys.executable,
-            '-m',
-            'pip',
-            'download',
-            '-q',
-            '-d',
-            str(wheelhouse),
-            'build',
-            'colorama',
-            'meson',
-            'ninja',
-            'patchelf',
-            'pyproject-metadata',
-            'tomli',
-            'typing-extensions',
-            'wheel',
-        ],
-        check=True,
-    )
+    meson_python = str(package_dir.parent.parent)
+    # Populate wheelhouse with wheel for the following packages and
+    # their dependencies.  Wheels are downloaded from PyPI or built
+    # from the source distribution as needed.  Sources or wheels in
+    # the pip cache are used when available.
+    packages = [
+        meson_python,
+        'build',
+        'wheel',
+    ]
+    subprocess.run([sys.executable, '-m', 'pip', 'wheel', '--wheel-dir', str(wheelhouse), *packages], check=True)
     return str(wheelhouse)
 
 

tests/docs/examples/test_spam.py

@@ -19,11 +19,11 @@ def test_build_and_import(venv, tmp_dir_session):
     else:
         wheel = build_project_wheel(package=examples_dir / 'spam', outdir=tmp_dir_session)
 
-        subprocess.check_call([
-            venv.executable, '-m', 'pip', '--disable-pip-version-check', 'install', wheel
-        ])
-        output = subprocess.check_output([
-            venv.executable, '-c', 'import spam; print(spam.add(1, 2))'
-        ])
+        subprocess.run(
+            [venv.executable, '-m', 'pip', 'install', wheel],
+            check=True)
+        output = subprocess.run(
+            [venv.executable, '-c', 'import spam; print(spam.add(1, 2))'],
+            check=True, stdout=subprocess.PIPE).stdout
 
         assert int(output) == 3

tests/test_pep518.py

@@ -15,10 +15,9 @@
 @pytest.mark.parametrize(
     'build_arg', ['', '--wheel'], ids=['sdist_to_wheel', 'wheel_directly']
 )
-@pytest.mark.xfail(sys.platform.startswith('cygwin'), reason='ninja pip package not available on cygwin', strict=True)
 def test_pep518(pep518, package, build_arg, tmp_path):
     dist = tmp_path / 'dist'
 
-    with cd_package(package) as package_dir, in_git_repo_context():
+    with cd_package(package), in_git_repo_context():
         build_args = [build_arg] if build_arg else []
-        subprocess.run([sys.executable, '-m', 'build', f'--outdir={dist}', *build_args], cwd=package_dir, check=True)
+        subprocess.run([sys.executable, '-m', 'build', '--outdir', str(dist), *build_args], check=True)

tests/test_project.py

@@ -65,7 +65,7 @@ def last_two_meson_args():
 
     # create the build directory ourselves because Project._meson is mocked
     builddir = str(tmp_dir_session / 'build')
-    subprocess.check_call(['meson', 'setup', '.', builddir])
+    subprocess.run(['meson', 'setup', '.', builddir], check=True)
 
     config_settings = {
         'builddir': builddir,  # use the build directory we created

tests/test_wheel.py

@@ -141,12 +141,14 @@ def test_configure_data(wheel_configure_data):
 
 @pytest.mark.skipif(platform.system() != 'Linux', reason='Unsupported on this platform for now')
 def test_local_lib(venv, wheel_link_against_local_lib):
-    subprocess.check_call([
-        venv.executable, '-m', 'pip', '--disable-pip-version-check', 'install', wheel_link_against_local_lib
-    ])
-    assert subprocess.check_output([
-        venv.executable, '-c', 'import example; print(example.example_sum(1, 2))'
-    ]).decode().strip() == '3'
+    subprocess.run(
+        [venv.executable, '-m', 'pip', 'install', wheel_link_against_local_lib],
+        check=True)
+    output = subprocess.run(
+        [venv.executable, '-c', 'import example; print(example.example_sum(1, 2))'],
+        stdout=subprocess.PIPE,
+        check=True).stdout
+    assert int(output) == 3
 
 
 def test_contents_license_file(wheel_license_file):