fix: update deprecated option check

Signed-off-by: Henry Schreiner <[email protected]>
pypa · May 26, 2021 · b24757d · b24757d
1 parent 61af5e4
commit b24757d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 52 deletions.
diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py
@@ -134,8 +134,6 @@ def main() -> None:
 
     args = parser.parse_args()
 
-    detect_obsolete_options()
-
     if args.platform != "auto":
         platform = args.platform
     else:
@@ -222,6 +220,10 @@ def main() -> None:
     ) or get_requires_python_str(package_dir)
     requires_python = None if requires_python_str is None else SpecifierSet(requires_python_str)
 
+    deprecated_selectors("CIBW_BUILD", build_config, error=True)
+    deprecated_selectors("CIBW_SKIP", skip_config)
+    deprecated_selectors("CIBW_TEST_SKIP", test_skip)
+
     build_selector = BuildSelector(
         build_config=build_config, skip_config=skip_config, requires_python=requires_python
     )
@@ -361,35 +363,12 @@ def main() -> None:
             assert_never(platform)
 
 
-def detect_obsolete_options() -> None:
-    # Check the old 'MANYLINUX1_*_IMAGE' options
-    for (deprecated, alternative) in [
-        ("CIBW_MANYLINUX1_X86_64_IMAGE", "CIBW_MANYLINUX_X86_64_IMAGE"),
-        ("CIBW_MANYLINUX1_I686_IMAGE", "CIBW_MANYLINUX_I686_IMAGE"),
-    ]:
-        if deprecated in os.environ:
-            print(
-                f"'{deprecated}' has been deprecated, and will be removed in a future release. Use the option '{alternative}' instead."
-            )
-            if alternative not in os.environ:
-                print(f"Using value of option '{deprecated}' as replacement for '{alternative}'")
-                os.environ[alternative] = os.environ[deprecated]
-            else:
-                print(f"Option '{alternative}' is not empty. Please unset '{deprecated}'")
-                sys.exit(2)
-
-    # Check for deprecated identifiers in 'CIBW_BUILD' and 'CIBW_SKIP' options
-    for option in ["CIBW_BUILD", "CIBW_SKIP"]:
-        for deprecated, alternative in [
-            ("manylinux1", "manylinux"),
-            ("macosx_10_6_intel", "macosx_x86_64"),
-            ("macosx_10_9_x86_64", "macosx_x86_64"),
-        ]:
-            if option in os.environ and deprecated in os.environ[option]:
-                print(
-                    f"Build identifiers with '{deprecated}' have been deprecated. Replacing all occurences of '{deprecated}' with '{alternative}' in the option '{option}'"
-                )
-                os.environ[option] = os.environ[option].replace(deprecated, alternative)
+def deprecated_selectors(name: str, selector: str, *, error: bool = False) -> None:
+    if "p27" in selector or "p35" in selector:
+        msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {name}"
+        print(msg, file=sys.stderr)
+        if error:
+            sys.exit(4)
 
 
 def print_preamble(platform: str, build_options: BuildOptions) -> None:

diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py
@@ -238,35 +238,39 @@ def test_build_verbosity(
     assert intercepted_build_args.args[0].build_verbosity == expected_verbosity
 
 
-@pytest.mark.parametrize("option_name", ["CIBW_BUILD", "CIBW_SKIP"])
 @pytest.mark.parametrize(
-    "option_value, build_selector_patterns",
+    "selector",
     [
-        ("*-manylinux1_*", ["*-manylinux_*"]),
-        ("*-macosx_10_6_intel", ["*-macosx_x86_64"]),
-        ("*-macosx_10_9_x86_64", ["*-macosx_x86_64"]),
-        ("cp37-macosx_10_9_x86_64", ["cp37-macosx_x86_64"]),
+        "CIBW_BUILD",
+        "CIBW_SKIP",
+        "CIBW_TEST_SKIP",
     ],
 )
-def test_build_selector_migrations(
-    intercepted_build_args,
-    monkeypatch,
-    option_name,
-    option_value,
-    build_selector_patterns,
-    allow_empty,
+@pytest.mark.parametrize(
+    "pattern",
+    [
+        "cp27-*",
+        "cp35-*",
+        "?p27*",
+        "?p35*",
+    ],
+)
+def test_build_selector_deprecated_error(
+    monkeypatch, platform, intercepted_build_args, selector, pattern, allow_empty, capsys
 ):
-    monkeypatch.setenv(option_name, option_value)
-
-    main()
+    monkeypatch.setenv(selector, pattern)
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
-    assert isinstance(intercepted_build_selector, BuildSelector)
+    if selector == "CIBW_BUILD":
+        with pytest.raises(SystemExit) as ex:
+            main()
+        assert ex.value.code == 4
 
-    if option_name == "CIBW_BUILD":
-        assert intercepted_build_selector.build_patterns == build_selector_patterns
     else:
-        assert intercepted_build_selector.skip_patterns == build_selector_patterns
+        main()
+
+    stderr = capsys.readouterr().err
+    msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {selector}"
+    assert msg in stderr
 
 
 @pytest.mark.parametrize("before_all", ["", None, "test text"])