Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-148887: Remove version hardcoding in Tools/pixi-packages #148890

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
isuruf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

gh-148887: Remove version hardcoding in Tools/pixi-packages #148890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Tools/pixi-packages/asan/pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ version = "*"

[package.build.config]
recipe = "../default/recipe.yaml"
experimental = true
4 changes: 0 additions & 4 deletions Tools/pixi-packages/asan/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
variant:
- asan
abi_tag:
- asan_cp315
version:
- 3.15
8 changes: 8 additions & 0 deletions Tools/pixi-packages/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ else
exit 1
fi

VER_REF=$(cat configure.ac | grep "\[PYTHON_VERSION\]\, \[" | sed -n 's/.*\[\([0-9.]*\)\].*/\1/p')
VER=$(echo ${PKG_VERSION} | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')

if [[ "${VER_REF}" != "${VER}" ]]; then
echo "Unexpected version from conda package. Got ${VER}. Expected ${VER_REF}"
exit 1
fi

# rattler-build by default set a target of 10.9
# override it to at least 10.12
case ${MACOSX_DEPLOYMENT_TARGET:-10.12} in
Expand Down
1 change: 1 addition & 0 deletions Tools/pixi-packages/default/pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ version = "*"

[package.build.config]
recipe = "../default/recipe.yaml"
experimental = true
4 changes: 3 additions & 1 deletion Tools/pixi-packages/default/recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
# propagate the changes to the other variants.

context:
# Keep up to date
version: ${{ git.latest_tag(".")[1:] }}
Copy link
Copy Markdown
Member

@hugovk hugovk Apr 22, 2026

Choose a reason for hiding this comment

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

The tags start with v, for example: v3.15.0a8. Does that need stripping?

Also, in two weeks, we'll branch main to a 3.15 branch, and main will become the home for 3.16.

There won't be any 3.16 tags until October.

https://peps.python.org/pep-0826/

Will that cause a problem?

Copy link
Copy Markdown
Contributor Author

@isuruf isuruf Apr 22, 2026

Choose a reason for hiding this comment

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

The tags start with v, for example: v3.15.0a8. Does that need stripping?

Yes, I've stripped v by doing [1:].

There won't be any 3.16 tags until October.

Yes, that'll cause an issue if git describe --tags shows 3.15 instead of 3.16.

freethreading_tag: ${{ "t" if "freethreading" in variant else "" }}
abi_prefix: ${{ (variant | split("-"))[0] + "_" if "san" in variant else "" }}
abi_tag: ${{ abi_prefix }}cp${{ (version | split('.'))[:2] | join('') }}

recipe:
name: python
Expand Down
4 changes: 0 additions & 4 deletions Tools/pixi-packages/default/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
variant:
- default
abi_tag:
- cp315
version:
- 3.15
1 change: 1 addition & 0 deletions Tools/pixi-packages/freethreading/pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ version = "*"

[package.build.config]
recipe = "../default/recipe.yaml"
experimental = true
4 changes: 0 additions & 4 deletions Tools/pixi-packages/freethreading/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
variant:
- freethreading
abi_tag:
- cp315t
version:
- 3.15
1 change: 1 addition & 0 deletions Tools/pixi-packages/tsan-freethreading/pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ version = "*"

[package.build.config]
recipe = "../default/recipe.yaml"
experimental = true
4 changes: 0 additions & 4 deletions Tools/pixi-packages/tsan-freethreading/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
variant:
- tsan-freethreading
abi_tag:
- tsan_cp315t
version:
- 3.15
Loading