Add BASE_IGNORED_REQUIREMENTS and rename

Author: agriyakhetarpal

pyodide_build/cli/config.py

@@ -21,7 +21,7 @@
     "ldflags": "SIDE_MODULE_LDFLAGS",
     "meson_cross_file": "MESON_CROSS_FILE",
     "xbuildenv_path": "PYODIDE_XBUILDENV_PATH",
-    "avoided_build_requirements": "AVOIDED_BUILD_REQUIREMENTS",
+    "ignored_build_requirements": "IGNORED_BUILD_REQUIREMENTS",
 }
 
 

pyodide_build/config.py

@@ -10,8 +10,8 @@
     exit_with_stdio,
     search_pyproject_toml,
 )
+from pyodide_build.constants import BASE_IGNORED_REQUIREMENTS
 from pyodide_build.logger import logger
-from pyodide_build.pypabuild import AVOIDED_REQUIREMENTS
 
 
 class ConfigManager:
@@ -200,7 +200,7 @@ def _get_make_environment_vars(self) -> Mapping[str, str]:
     "build_dependency_index_url": "BUILD_DEPENDENCY_INDEX_URL",
     "default_cross_build_env_url": "DEFAULT_CROSS_BUILD_ENV_URL",
     "xbuildenv_path": "PYODIDE_XBUILDENV_PATH",
-    "avoided_build_requirements": "AVOIDED_BUILD_REQUIREMENTS",
+    "ignored_build_requirements": "IGNORED_BUILD_REQUIREMENTS",
     # maintainer only
     "_f2c_fixes_wrapper": "_F2C_FIXES_WRAPPER",
 }
@@ -220,7 +220,7 @@ def _get_make_environment_vars(self) -> Mapping[str, str]:
     "build_dependency_index_url",
     "default_cross_build_env_url",
     "xbuildenv_path",
-    "avoided_build_requirements",
+    "ignored_build_requirements",
     # maintainer only
     "_f2c_fixes_wrapper",
 }
@@ -242,7 +242,8 @@ def _get_make_environment_vars(self) -> Mapping[str, str]:
     "build_dependency_index_url": "https://pypi.anaconda.org/pyodide/simple",
     "default_cross_build_env_url": "",
     "xbuildenv_path": "",
-    "avoided_build_requirements": " ".join(AVOIDED_REQUIREMENTS),
+    # A list of PEP508 build-time requirements to be ignored when building a wheel
+    "ignored_build_requirements": " ".join(BASE_IGNORED_REQUIREMENTS),
     # maintainer only
     "_f2c_fixes_wrapper": "",
 }

pyodide_build/constants.py

@@ -0,0 +1,8 @@
+# Some reusable constants that are used at various sources in our code.
+# TODO: collect and add more constants here.
+
+BASE_IGNORED_REQUIREMENTS: list[str] = [
+    # mesonpy installs patchelf in linux platform but we don't want it.
+    "patchelf",
+    "oldest-supported-numpy",
+]

pyodide_build/pypabuild.py

@@ -32,17 +32,6 @@
     _ProjectBuilder,
 )
 
-AVOIDED_REQUIREMENTS = [
-    # mesonpy installs patchelf in linux platform but we don't want it.
-    "patchelf",
-    "oldest-supported-numpy",
-]
-
-AVOIDED_REQUIREMENTS: list[str] = [
-    "patchelf",
-    "oldest-supported-numpy",
-] + get_host_build_flag("AVOIDED_BUILD_REQUIREMENTS").split()
-
 # corresponding env variables for symlinks
 SYMLINK_ENV_VARS = {
     "cc": "CC",
@@ -103,6 +92,8 @@ def _runner(cmd, cwd=None, extra_environ=None):
 
 
 def symlink_unisolated_packages(env: DefaultIsolatedEnv) -> None:
+    from pyodide_build.build_env import get_build_flag, get_unisolated_packages
+
     pyversion = get_pyversion()
     site_packages_path = f"lib/{pyversion}/site-packages"
     env_site_packages = Path(env.path) / site_packages_path
@@ -137,14 +128,17 @@ def remove_avoided_requirements(
 def install_reqs(
     build_env: Mapping[str, str], env: DefaultIsolatedEnv, reqs: set[str]
 ) -> None:
+    IGNORED_BUILD_REQUIREMENTS = get_host_build_flag(
+        "IGNORED_BUILD_REQUIREMENTS"
+    ).split()
     # propagate PIP config from build_env to current environment
     with common.replace_env(
         os.environ | {k: v for k, v in build_env.items() if k.startswith("PIP")}
     ):
         env.install(
             remove_avoided_requirements(
                 reqs,
-                get_unisolated_packages() + AVOIDED_REQUIREMENTS,
+                get_unisolated_packages() + IGNORED_BUILD_REQUIREMENTS,
             )
         )
 
@@ -262,7 +256,6 @@ def make_command_wrapper_symlinks(symlink_dir: Path) -> dict[str, str]:
     -------
     The dictionary of compiler environment variables that points to the symlinks.
     """
-
     # For maintainers:
     # - you can set "_f2c_fixes_wrapper" variable in pyproject.toml
     # in order to change the script to use when cross-compiling
@@ -321,6 +314,7 @@ def get_build_env(
     Returns a dict of environment variables that should be used when building
     a package with pypa/build.
     """
+    from pyodide_build.build_env import get_build_flag
 
     kwargs = {
         "pkgname": pkgname,

pyodide_build/tests/test_pypabuild.py

@@ -27,8 +27,8 @@ def test_install_reqs(tmp_path, dummy_xbuildenv):
     for req in reqs:
         assert req in env.installed
 
-    pypabuild.install_reqs({}, env, set(pypabuild.AVOIDED_REQUIREMENTS))  # type: ignore[arg-type]
-    for req in pypabuild.AVOIDED_REQUIREMENTS:
+    pypabuild.install_reqs({}, env, set(pypabuild.BASE_IGNORED_REQUIREMENTS))  # type: ignore[arg-type]
+    for req in pypabuild.BASE_IGNORED_REQUIREMENTS:
         assert req not in env.installed