diff --git a/conda_forge_tick/update_sources.py b/conda_forge_tick/update_sources.py index 2417ba3a9..ddbf51a4f 100644 --- a/conda_forge_tick/update_sources.py +++ b/conda_forge_tick/update_sources.py @@ -580,7 +580,7 @@ def get_url(self, node_attrs: AttrsTypedDict) -> str | None: if ci_support_keys: ci_support_key = sorted(ci_support_keys)[0] plat, arch = get_platform_arch_from_ci_support_filename( - ci_support_key.replace("ci_support", "") + ci_support_key.replace("ci_support_", "") ) platform_arch = f"{plat}-{arch}" cbc_data = node_attrs[ci_support_key] # type: ignore[literal-required] diff --git a/conda_forge_tick/utils.py b/conda_forge_tick/utils.py index 5ee29787f..fece8eb8f 100644 --- a/conda_forge_tick/utils.py +++ b/conda_forge_tick/utils.py @@ -518,7 +518,7 @@ def _render_recipe_yaml( ) target_platform_flags = ( [] - if platform_arch is None or variant_config_flags + if platform_arch is None or platform_arch == "noarch" else ["--target-platform", platform_arch] ) diff --git a/tests/test_feedstock_parser.py b/tests/test_feedstock_parser.py index 53cfc82d7..7fbf80f4d 100644 --- a/tests/test_feedstock_parser.py +++ b/tests/test_feedstock_parser.py @@ -126,3 +126,11 @@ def test_get_feedstock_commit_hash_and_timestamp(): sha, ts = _get_feedstock_commit_hash_and_timestamp("ngmix") assert sha is not None assert ts is not None + + +def test_feedstock_parser_load_feedstock_local_pyobjc_framework_quartz(): + attrs = load_feedstock_local( + "pyobjc-framework-quartz", + {}, + ) + assert attrs["feedstock_name"] == "pyobjc-framework-quartz" diff --git a/tests/test_v1_yaml/cross_compile/config_recipe.yaml b/tests/test_v1_yaml/cross_compile/config_recipe.yaml index fbc85458b..23ad0a10c 100644 --- a/tests/test_v1_yaml/cross_compile/config_recipe.yaml +++ b/tests/test_v1_yaml/cross_compile/config_recipe.yaml @@ -13,7 +13,6 @@ source: build: number: 2 - skip: win requirements: build: diff --git a/tests/test_v1_yaml/cross_compile/config_recipe_correct.yaml b/tests/test_v1_yaml/cross_compile/config_recipe_correct.yaml index f95eebe29..6a934ee1e 100644 --- a/tests/test_v1_yaml/cross_compile/config_recipe_correct.yaml +++ b/tests/test_v1_yaml/cross_compile/config_recipe_correct.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: win requirements: build: diff --git a/tests/test_v1_yaml/cross_compile/config_recipe_correct_cmake.yaml b/tests/test_v1_yaml/cross_compile/config_recipe_correct_cmake.yaml index f0ce8c5e6..1027b707c 100644 --- a/tests/test_v1_yaml/cross_compile/config_recipe_correct_cmake.yaml +++ b/tests/test_v1_yaml/cross_compile/config_recipe_correct_cmake.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: win requirements: build: diff --git a/tests/test_v1_yaml/cross_compile/config_recipe_correct_make_check.yaml b/tests/test_v1_yaml/cross_compile/config_recipe_correct_make_check.yaml index f95eebe29..6a934ee1e 100644 --- a/tests/test_v1_yaml/cross_compile/config_recipe_correct_make_check.yaml +++ b/tests/test_v1_yaml/cross_compile/config_recipe_correct_make_check.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: win requirements: build: diff --git a/tests/test_v1_yaml/version_build_number_via_context.yaml b/tests/test_v1_yaml/version_build_number_via_context.yaml index 059e8fedb..eceb4bdc9 100644 --- a/tests/test_v1_yaml/version_build_number_via_context.yaml +++ b/tests/test_v1_yaml/version_build_number_via_context.yaml @@ -96,7 +96,7 @@ build: number: ${{ build_number }} string: ${{ torch_proc_type }}_py${{ python | version_to_buildstring }}_h${{ hash }}_${{ build_number }} # CUDA < 12 not supported by pytorch anymore - skip: cuda_compiler_version == "11.8" or win + skip: cuda_compiler_version == "11.8" outputs: - package: diff --git a/tests/test_v1_yaml/version_build_number_via_context_correct.yaml b/tests/test_v1_yaml/version_build_number_via_context_correct.yaml index 681efd688..866d2e976 100644 --- a/tests/test_v1_yaml/version_build_number_via_context_correct.yaml +++ b/tests/test_v1_yaml/version_build_number_via_context_correct.yaml @@ -96,7 +96,7 @@ build: number: ${{ build_number }} string: ${{ torch_proc_type }}_py${{ python | version_to_buildstring }}_h${{ hash }}_${{ build_number }} # CUDA < 12 not supported by pytorch anymore - skip: cuda_compiler_version == "11.8" or win + skip: cuda_compiler_version == "11.8" outputs: - package: diff --git a/tests/test_v1_yaml/version_cfyaml_cleanup_simple.yaml b/tests/test_v1_yaml/version_cfyaml_cleanup_simple.yaml index beae754e1..27b18e4a4 100644 --- a/tests/test_v1_yaml/version_cfyaml_cleanup_simple.yaml +++ b/tests/test_v1_yaml/version_cfyaml_cleanup_simple.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: win noarch: python script: python -m pip install --no-deps --ignore-installed . diff --git a/tests/test_v1_yaml/version_cfyaml_cleanup_simple_correct.yaml b/tests/test_v1_yaml/version_cfyaml_cleanup_simple_correct.yaml index 0abdcd36a..60c566a39 100644 --- a/tests/test_v1_yaml/version_cfyaml_cleanup_simple_correct.yaml +++ b/tests/test_v1_yaml/version_cfyaml_cleanup_simple_correct.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: win noarch: python script: python -m pip install --no-deps --ignore-installed . diff --git a/tests/test_v1_yaml/version_cos7_config_simple.yaml b/tests/test_v1_yaml/version_cos7_config_simple.yaml index 5c863af7d..a088629df 100644 --- a/tests/test_v1_yaml/version_cos7_config_simple.yaml +++ b/tests/test_v1_yaml/version_cos7_config_simple.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: win noarch: python script: python -m pip install --no-deps --ignore-installed . diff --git a/tests/test_v1_yaml/version_cos7_config_simple_correct.yaml b/tests/test_v1_yaml/version_cos7_config_simple_correct.yaml index 1d817a119..e782c78db 100644 --- a/tests/test_v1_yaml/version_cos7_config_simple_correct.yaml +++ b/tests/test_v1_yaml/version_cos7_config_simple_correct.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: win noarch: python script: python -m pip install --no-deps --ignore-installed . diff --git a/tests/test_v1_yaml/version_event_stream.yaml b/tests/test_v1_yaml/version_event_stream.yaml index f55ef5efd..0d049f09c 100644 --- a/tests/test_v1_yaml/version_event_stream.yaml +++ b/tests/test_v1_yaml/version_event_stream.yaml @@ -15,7 +15,6 @@ source: build: script: ${{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv number: 2 - skip: win requirements: build: diff --git a/tests/test_v1_yaml/version_event_stream_correct.yaml b/tests/test_v1_yaml/version_event_stream_correct.yaml index 6892159bf..c6398088d 100644 --- a/tests/test_v1_yaml/version_event_stream_correct.yaml +++ b/tests/test_v1_yaml/version_event_stream_correct.yaml @@ -15,7 +15,6 @@ source: build: script: ${{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv number: 0 - skip: win requirements: build: