Added tests and fixed implementation

Author: astrofrog

extension_helpers/_setup_helpers.py

@@ -6,8 +6,6 @@
 
 import logging
 import os
-import re
-import sys
 import shutil
 import subprocess
 import sys
@@ -16,7 +14,12 @@
 from setuptools import Extension, find_packages
 from setuptools.command.build_ext import new_compiler
 
-from ._utils import import_file, walk_skip_hidden
+from ._utils import (
+    abi_to_versions,
+    get_limited_api_option,
+    import_file,
+    walk_skip_hidden,
+)
 
 __all__ = ["get_compiler", "get_extensions", "pkg_config"]
 
@@ -35,19 +38,6 @@
 """
 
 
-def _abi_to_version_info(abi):
-    match = re.fullmatch(r'^cp(\d)(\d+)$', abi)
-    if match is None:
-        return None
-    else:
-        return int(match[1]), int(match[2])
-
-
-def _version_info_to_version_hex(major=0, minor=0):
-    """Returns a PY_VERSION_HEX for {major}.{minor).0"""
-    return f'0x{major:02x}{minor:02x}0000'
-
-
 def get_compiler():
     """
     Determines the compiler that will be used to build extension modules.
@@ -163,22 +153,20 @@ def get_extensions(srcdir="."):
         extension.sources = sources
 
     use_limited_api = False
-    abi = get_distutils_option('py_limited_api', ['bdist_wheel'])
+    abi = get_limited_api_option(srcdir=srcdir)
     if abi:
-        version_info = _abi_to_version_info(abi)
-        if version_info:
-            use_limited_api = True
+        version_info, version_hex = abi_to_versions(abi)
+
+        if version_info is None:
+            log.warn("Unrecognized abi version for limited API: {abi}")
 
-    if use_limited_api:
         log.info(
-            'Targeting PEP 384 limited API supporting Python >= %d.%d',
-            *version_info)
-        version_hex = _version_info_to_version_hex(*version_info)
+            f"Targeting PEP 384 limited API supporting Python >= {version_info[0], version_info[1]}"
+        )
+
         for ext in ext_modules:
             ext.py_limited_api = True
-            ext.define_macros.append(('Py_LIMITED_API', version_hex))
-    else:
-        log.warn(_PEP_384_WARNING)
+            ext.define_macros.append(("Py_LIMITED_API", version_hex))
 
     return ext_modules
 

extension_helpers/_utils.py

@@ -1,12 +1,20 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
 import os
+import re
 import sys
+from configparser import ConfigParser
 from importlib import machinery as import_machinery
 from importlib.util import module_from_spec, spec_from_file_location
 from pathlib import Path
 
-__all__ = ["write_if_different", "import_file"]
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
+
+__all__ = ["write_if_different", "import_file", "get_limited_api_option", "abi_to_versions"]
 
 
 if sys.platform == "win32":
@@ -138,3 +146,53 @@ def import_file(filename, name=None):
     loader.exec_module(mod)
 
     return mod
+
+
+def get_limited_api_option(srcdir):
+    """
+    Checks setup.cfg and pyproject.toml files in the current directory
+    for the py_limited_api setting
+    """
+
+    srcdir = Path(srcdir)
+
+    setup_cfg = srcdir / "setup.cfg"
+
+    if setup_cfg.exists():
+        cfg = ConfigParser()
+        cfg.read(setup_cfg)
+        if cfg.has_option("bdist_wheel", "py_limited_api"):
+            return cfg.get("bdist_wheel", "py_limited_api")
+
+    pyproject = srcdir / "pyproject.toml"
+    if pyproject.exists():
+        with pyproject.open("rb") as f:
+            pyproject_cfg = tomllib.load(f)
+            if (
+                "tool" in pyproject_cfg
+                and "distutils" in pyproject_cfg["tool"]
+                and "bdist_wheel" in pyproject_cfg["tool"]["distutils"]
+                and "py-limited-api" in pyproject_cfg["tool"]["distutils"]["bdist_wheel"]
+            ):
+                return pyproject_cfg["tool"]["distutils"]["bdist_wheel"]["py-limited-api"]
+
+
+def _abi_to_version_info(abi):
+    match = re.fullmatch(r"^cp(\d)(\d+)$", abi)
+    if match is None:
+        return None
+    else:
+        return int(match[1]), int(match[2])
+
+
+def _version_info_to_version_hex(major=0, minor=0):
+    """Returns a PY_VERSION_HEX for {major}.{minor).0"""
+    return f"0x{major:02X}{minor:02X}0000"
+
+
+def abi_to_versions(abi):
+    version_info = _abi_to_version_info(abi)
+    if version_info is None:
+        return None, None
+    else:
+        return version_info, _version_info_to_version_hex(*version_info)

extension_helpers/tests/test_setup_helpers.py

@@ -35,7 +35,13 @@ def test_get_compiler():
     assert get_compiler() in POSSIBLE_COMPILERS
 
 
-def _extension_test_package(tmp_path, request, extension_type="c", include_numpy=False):
+def _extension_test_package(
+    tmp_path,
+    request=None,
+    extension_type="c",
+    include_numpy=False,
+    include_setup_py=True,
+):
     """Creates a simple test package with an extension module."""
 
     test_pkg = tmp_path / "test_pkg"
@@ -106,24 +112,25 @@ def get_extensions():
         )
     )
 
-    (test_pkg / "setup.py").write_text(
-        dedent(
-            f"""\
-        import sys
-        from os.path import join
-        from setuptools import setup, find_packages
-        sys.path.insert(0, r'{extension_helpers_PATH}')
-        from extension_helpers import get_extensions
-
-        setup(
-            name='helpers_test_package',
-            version='0.1',
-            packages=find_packages(),
-            ext_modules=get_extensions()
-        )
-    """
+    if include_setup_py:
+        (test_pkg / "setup.py").write_text(
+            dedent(
+                f"""\
+            import sys
+            from os.path import join
+            from setuptools import setup, find_packages
+            sys.path.insert(0, r'{extension_helpers_PATH}')
+            from extension_helpers import get_extensions
+
+            setup(
+                name='helpers_test_package',
+                version='0.1',
+                packages=find_packages(),
+                ext_modules=get_extensions()
+            )
+        """
+            )
         )
-    )
 
     if "" in sys.path:
         sys.path.remove("")
@@ -133,7 +140,8 @@ def get_extensions():
     def finalize():
         cleanup_import("helpers_test_package")
 
-    request.addfinalizer(finalize)
+    if request:
+        request.addfinalizer(finalize)
 
     return test_pkg
 
@@ -455,3 +463,87 @@ def test():
                 pass
             else:
                 raise AssertionError(package_name + ".compiler_version should not exist")
+
+
+# Tests to make sure that limited API support works correctly
+
+
+@pytest.mark.parametrize("config", ("setup.cfg", "pyproject.toml"))
+@pytest.mark.parametrize("limited_api", (None, "cp311"))
+@pytest.mark.parametrize("extension_type", ("c", "pyx", "both"))
+def test_limited_api(tmp_path, config, limited_api, extension_type):
+
+    package = _extension_test_package(
+        tmp_path, extension_type=extension_type, include_numpy=True, include_setup_py=False
+    )
+
+    if config == "setup.cfg":
+
+        setup_cfg = dedent(
+            """\
+            [metadata]
+            name = helpers_test_package
+            version = 0.1
+
+            [options]
+            packages = find:
+
+            [extension-helpers]
+            use_extension_helpers = true
+        """
+        )
+
+        if limited_api:
+            setup_cfg += f"\n[bdist_wheel]\npy_limited_api={limited_api}"
+
+        (package / "setup.cfg").write_text(setup_cfg)
+
+        # Still require a minimal pyproject.toml file if no setup.py file
+
+        (package / "pyproject.toml").write_text(
+            dedent(
+                """
+            [build-system]
+            requires = ["setuptools>=43.0.0",
+                        "wheel"]
+            build-backend = 'setuptools.build_meta'
+
+            [tool.extension-helpers]
+            use_extension_helpers = true
+        """
+            )
+        )
+
+    elif config == "pyproject.toml":
+
+        pyproject_toml = dedent(
+            """\
+            [build-system]
+            requires = ["setuptools>=43.0.0",
+                        "wheel"]
+            build-backend = 'setuptools.build_meta'
+
+            [project]
+            name = "hehlpers_test_package"
+            version = "0.1"
+
+            [tool.setuptools.packages]
+            find = {namespaces = false}
+
+            [tool.extension-helpers]
+            use_extension_helpers = true
+            """
+        )
+
+        if limited_api:
+            pyproject_toml += f'\n[tool.distutils.bdist_wheel]\npy-limited-api = "{limited_api}"'
+
+        (package / "pyproject.toml").write_text(pyproject_toml)
+
+    with chdir(package):
+        subprocess.run([sys.executable, "-m", "build", "--wheel", "--no-isolation"], check=True)
+
+    wheels = os.listdir(package / "dist")
+
+    assert len(wheels) == 1
+    assert ("abi3" in wheels[0]) == (limited_api is not None)

extension_helpers/tests/test_utils.py

@@ -3,7 +3,12 @@
 
 import pytest
 
-from .._utils import import_file, write_if_different
+from .._utils import (
+    abi_to_versions,
+    get_limited_api_option,
+    import_file,
+    write_if_different,
+)
 
 
 @pytest.mark.parametrize("path_type", ("str", "path"))
@@ -32,3 +37,63 @@ def test_write_if_different(tmp_path, path_type):
     write_if_different(filepath, b"abcd")
     time3 = os.path.getmtime(filepath)
     assert time3 > time1
+
+
+class TestGetLimitedAPIOption:
+
+    def test_nofiles(self, tmp_path):
+        assert get_limited_api_option(tmp_path) is None
+
+    def test_empty_setup_cfg(self, tmp_path):
+        filepath = (tmp_path / "setup.cfg").write_text("")
+        assert get_limited_api_option(tmp_path) is None
+
+    def test_empty_pyproject_toml(self, tmp_path):
+        filepath = (tmp_path / "pyproject.toml").write_text("")
+        assert get_limited_api_option(tmp_path) is None
+
+    def test_setup_cfg(self, tmp_path):
+
+        filepath = (tmp_path / "setup.cfg").write_text("[bdist_wheel]\npy_limited_api=cp311")
+        assert get_limited_api_option(tmp_path) == "cp311"
+
+        # Make sure things still work even if an empty pyproject.toml file is present
+
+        filepath = (tmp_path / "pyproject.toml").write_text("")
+        assert get_limited_api_option(tmp_path) == "cp311"
+
+        # And if the pyproject.toml has the right section but not the right option
+
+        filepath = (tmp_path / "setup.cfg.toml").write_text(
+            "[tool.distutils.bdist_wheel]\nspam=1\n"
+        )
+        assert get_limited_api_option(tmp_path) == "cp311"
+
+    def test_pyproject(self, tmp_path):
+
+        filepath = (tmp_path / "pyproject.toml").write_text(
+            '[tool.distutils.bdist_wheel]\npy-limited-api="cp312"\n'
+        )
+        assert get_limited_api_option(tmp_path) == "cp312"
+
+        # Make sure things still work even if an empty setup.cfg file is present
+
+        filepath = (tmp_path / "setup.cfg.toml").write_text("\n")
+        assert get_limited_api_option(tmp_path) == "cp312"
+
+        # And if the setup.cfg has the right section but not the right option
+
+        filepath = (tmp_path / "setup.cfg.toml").write_text("[bdist_wheel]\nspam=1\n")
+        assert get_limited_api_option(tmp_path) == "cp312"
+
+
+def test_abi_to_versions_invalid():
+    assert abi_to_versions("spam") == (None, None)
+
+
+def test_abi_to_versions_valid():
+    assert abi_to_versions("cp39") == ((3, 9), "0x03090000")
+    assert abi_to_versions("cp310") == ((3, 10), "0x030A0000")
+    assert abi_to_versions("cp311") == ((3, 11), "0x030B0000")
+    assert abi_to_versions("cp312") == ((3, 12), "0x030C0000")
+    assert abi_to_versions("cp313") == ((3, 13), "0x030D0000")

pyproject.toml

@@ -35,6 +35,7 @@ test = [
     "pytest",
     "pytest-cov",
     "cython",
+    "build"
 ]
 docs = [
     "sphinx",