Merge pull request #124 from shubhbapna/host-env-to-build-step

fix: pass environment variables from caller to build steps

Author: mergify[bot]

src/fromager/overrides.py

@@ -68,7 +68,6 @@ def extra_environ_for_pkg(
 
     Extra environment variables are stored in per-package .env files in the
     envs package, with a key=value per line.
-
     """
     extra_environ = {}
 

src/fromager/wheels.py

@@ -111,7 +111,7 @@ def default_build_wheel(
     if existing_path:
         path_parts.append(existing_path)
     updated_path = ":".join(path_parts)
-    override_env = {}
+    override_env = dict(os.environ)
     override_env.update(extra_environ)
     override_env["PATH"] = updated_path
     override_env["VIRTUAL_ENV"] = str(build_env.path)

tests/test_overrides.py

@@ -38,3 +38,20 @@ def test_patches_for_source_dir(tmp_path: pathlib.Path):
         overrides.patches_for_source_dir(patches_dir, "project-1.2.3-variant")
     )
     assert results == [p2, p5]
+
+
+def test_extra_environ_for_pkg(tmp_path: pathlib.Path):
+    env_dir = tmp_path / "env"
+    env_dir.mkdir()
+
+    variant_dir = env_dir / "variant"
+    variant_dir.mkdir()
+
+    project_env = variant_dir / "project.env"
+    project_env.write_text("VAR1=VALUE1\nVAR2=VALUE2")
+
+    result = overrides.extra_environ_for_pkg(env_dir, "project", "variant")
+    assert result == {"VAR1": "VALUE1", "VAR2": "VALUE2"}
+
+    result = overrides.extra_environ_for_pkg(env_dir, "non_existant_project", "variant")
+    assert result == {}