refactor: environment-pass and spaces

pypa · Nov 15, 2021 · 74cecd4 · 74cecd4
1 parent 4b8632c
commit 74cecd4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/cibuildwheel/environment.py b/cibuildwheel/environment.py
@@ -1,4 +1,5 @@
 import dataclasses
+import shlex
 from typing import Dict, List, Mapping, Optional
 
 import bashlex
@@ -85,7 +86,7 @@ def as_dictionary(
         return environment
 
     def add(self, name: str, value: str) -> None:
-        self.assignments.append(EnvironmentAssignment(f'{name}="{value}"'))
+        self.assignments.append(EnvironmentAssignment(f"{name}={shlex.quote(value)}"))
 
     def as_shell_commands(self) -> List[str]:
         return [a.as_shell_assignment() for a in self.assignments]

diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py
@@ -408,7 +408,7 @@ def build_options(self, identifier: Optional[str]) -> BuildOptions:
             environment_config = self.reader.get(
                 "environment", table={"item": '{k}="{v}"', "sep": " "}
             )
-            passenv = self.reader.get("passenv", sep=",").split(",")
+            environment_pass = self.reader.get("environment-pass", sep=" ").split()
             before_build = self.reader.get("before-build", sep=" && ")
             repair_command = self.reader.get("repair-wheel-command", sep=" && ")
 
@@ -441,7 +441,7 @@ def build_options(self, identifier: Optional[str]) -> BuildOptions:
 
             # Pass through environment variables
             if self.platform == "linux":
-                for passedenv in passenv:
+                for passedenv in environment_pass:
                     try:
                         environment.add(passedenv, os.environ[passedenv])
                     except KeyError:

diff --git a/cibuildwheel/resources/defaults.toml b/cibuildwheel/resources/defaults.toml
@@ -7,7 +7,7 @@ archs = ["auto"]
 build-frontend = "pip"
 dependency-versions = "pinned"
 environment = {}
-passenv = []
+environment-pass = []
 build-verbosity = ""
 
 before-all = ""

diff --git a/unit_test/options_test.py b/unit_test/options_test.py
@@ -15,7 +15,7 @@
 
 manylinux-x86_64-image = "manylinux1"
 
-passenv = ["EXAMPLE_ENV"]
+environment-pass = ["EXAMPLE_ENV"]
 
 [tool.cibuildwheel.macos]
 test-requires = "else"
@@ -85,4 +85,4 @@ def test_passthrough(tmp_path, monkeypatch):
 
     default_build_options = options.build_options(identifier=None)
 
-    assert default_build_options.environment == parse_environment('FOO="BAR" EXAMPLE_ENV="ONE"')
+    assert default_build_options.environment == parse_environment('FOO="BAR" EXAMPLE_ENV=ONE')