Skip to content

Pass --target-platform with --variant-config to rattler-build #6274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgorny wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Pass --target-platform with --variant-config to rattler-build #6274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7b80bc
Pass `--target-platform` with `--variant-config` to `rattler-build`
mgorny Jun 26, 2026
a1bfeca
Add a test for loading `pyobjc-framework-quartz`
mgorny Jun 26, 2026
48c4c47
Do not pass `noarch` as target platform
mgorny Jun 26, 2026
b75f537
Fix passing incorrect `.ci_support` filename in `BaseRawURL`
mgorny Jun 26, 2026
1b91d22
Remove `skip: win` from some v1 test recipes to fix tests
mgorny Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda_forge_tick/update_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion conda_forge_tick/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

@jaimergp jaimergp Jun 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if platform_arch is None or platform_arch == "noarch"
if platform_arch in (None, "noarch") or variant_config_flags

Better? Not sure what variant_config_flags is supposed to be checking here though.

@mgorny mgorny Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. platform_arch in (None, "noarch") is what I've tried first but mypy doesn't seem to be able to cope with it.
  2. variant_config_flags avoids passing --target-platform if we have a variant config. Removing this condition is the main point of this PR.

@jaimergp jaimergp Jul 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, mypy. Alright then.

else ["--target-platform", platform_arch]
)

Expand Down
8 changes: 8 additions & 0 deletions tests/test_feedstock_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 0 additions & 1 deletion tests/test_v1_yaml/cross_compile/config_recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 2
skip: win

requirements:
build:
Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/cross_compile/config_recipe_correct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 0
skip: win

requirements:
build:
Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/cross_compile/config_recipe_correct_cmake.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 0
skip: win

requirements:
build:
Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/cross_compile/config_recipe_correct_make_check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 0
skip: win

requirements:
build:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_v1_yaml/version_build_number_via_context.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_v1_yaml/version_build_number_via_context_correct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/version_cfyaml_cleanup_simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 0
skip: win
noarch: python
script: python -m pip install --no-deps --ignore-installed .

Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/version_cfyaml_cleanup_simple_correct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 0
skip: win
noarch: python
script: python -m pip install --no-deps --ignore-installed .

Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/version_cos7_config_simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 0
skip: win
noarch: python
script: python -m pip install --no-deps --ignore-installed .

Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/version_cos7_config_simple_correct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source:

build:
number: 0
skip: win
noarch: python
script: python -m pip install --no-deps --ignore-installed .

Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/version_event_stream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ source:
build:
script: ${{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv
number: 2
skip: win

requirements:
build:
Expand Down
1 change: 0 additions & 1 deletion tests/test_v1_yaml/version_event_stream_correct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ source:
build:
script: ${{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv
number: 0
skip: win

requirements:
build:
Expand Down
Loading