From a25d40c7bceb4db227aeb4a44fc74e28eb1015f1 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 15 Feb 2022 00:32:58 -0500 Subject: [PATCH] tests: use 'build' in tests instead of running setup.py (#3734) Co-authored-by: Anderson Bravalheri Co-authored-by: Anderson Bravalheri --- pyproject.toml | 2 +- tests/extra_python_package/test_files.py | 26 ++++++++++++------------ tests/requirements.txt | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5371c1b33..31fff8bd6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=42", "wheel", "cmake>=3.18", "ninja"] +requires = ["setuptools>=42", "cmake>=3.18", "ninja"] build-backend = "setuptools.build_meta" [tool.check-manifest] diff --git a/tests/extra_python_package/test_files.py b/tests/extra_python_package/test_files.py index a6b13bc5f..ba16b5224 100644 --- a/tests/extra_python_package/test_files.py +++ b/tests/extra_python_package/test_files.py @@ -108,19 +108,19 @@ def test_build_sdist(monkeypatch, tmpdir): out = subprocess.check_output( [ sys.executable, - "setup.py", - "sdist", - "--formats=tar", - "--dist-dir", + "-m", + "build", + "--sdist", + "--outdir", str(tmpdir), ] ) if hasattr(out, "decode"): out = out.decode() - (sdist,) = tmpdir.visit("*.tar") + (sdist,) = tmpdir.visit("*.tar.gz") - with tarfile.open(str(sdist)) as tar: + with tarfile.open(str(sdist), "r:gz") as tar: start = tar.getnames()[0] + "/" version = start[9:-1] simpler = {n.split("/", 1)[-1] for n in tar.getnames()[1:]} @@ -169,23 +169,23 @@ def test_build_global_dist(monkeypatch, tmpdir): monkeypatch.chdir(MAIN_DIR) monkeypatch.setenv("PYBIND11_GLOBAL_SDIST", "1") - out = subprocess.check_output( [ sys.executable, - "setup.py", - "sdist", - "--formats=tar", - "--dist-dir", + "-m", + "build", + "--sdist", + "--outdir", str(tmpdir), ] ) + if hasattr(out, "decode"): out = out.decode() - (sdist,) = tmpdir.visit("*.tar") + (sdist,) = tmpdir.visit("*.tar.gz") - with tarfile.open(str(sdist)) as tar: + with tarfile.open(str(sdist), "r:gz") as tar: start = tar.getnames()[0] + "/" version = start[16:-1] simpler = {n.split("/", 1)[-1] for n in tar.getnames()[1:]} diff --git a/tests/requirements.txt b/tests/requirements.txt index 1130c3fd5..1159287fa 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,4 @@ +build==0.7.0 numpy==1.21.5; platform_python_implementation=="PyPy" and sys_platform=="linux" and python_version=="3.7" numpy==1.19.3; platform_python_implementation!="PyPy" and python_version=="3.6" numpy==1.21.5; platform_python_implementation!="PyPy" and python_version>="3.7" and python_version<"3.10"