Skip to content

Commit 12da3b8

Browse files
committed
Fix
1 parent 8243c20 commit 12da3b8

File tree

10 files changed

+28
-24
lines changed

10 files changed

+28
-24
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
variant:
2+
- asan
3+
abi_tag:
4+
- cp315
5+
version:
6+
- 3.15

Tools/pixi-packages/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
if [[ "${PYTHON_VARIANT}" == "freethreading" ]]; then
44
echo "BUILD TYPE: FREE-THREADING"
5-
BUILD_DIR="../build_free_threading"
5+
BUILD_DIR="../build_freethreading"
66
CONFIGURE_EXTRA="--disable-gil"
77
elif [[ "${PYTHON_VARIANT}" == "asan" ]]; then
88
echo "BUILD TYPE: ASAN"
99
BUILD_DIR="../build_asan"
1010
CONFIGURE_EXTRA="--with-address-sanitizer"
1111
export ASAN_OPTIONS="strict_init_order=true"
12-
elif [[ "${PYTHON_VARIANT}" == "tsan_freethreading" ]]; then
12+
elif [[ "${PYTHON_VARIANT}" == "tsan-freethreading" ]]; then
1313
echo "BUILD TYPE: TSAN FREE-THREADING"
14-
BUILD_DIR="../build_tsan_free_threading"
14+
BUILD_DIR="../build_tsan-freethreading"
1515
CONFIGURE_EXTRA="--disable-gil --with-thread-sanitizer"
1616
export TSAN_OPTIONS="suppressions=${SRC_DIR}/Tools/tsan/suppressions_free_threading.txt"
1717
else

Tools/pixi-packages/default/pixi.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ channels = ["https://prefix.dev/conda-forge"]
33
platforms = ["osx-arm64", "linux-64"]
44
preview = ["pixi-build"]
55

6-
[workspace.build-variants]
7-
variant = ["default"]
8-
abi_tag = ["cp315"]
9-
version = ["3.15"]
10-
116
[package.build.backend]
127
name = "pixi-build-rattler-build"
138
version = "*"

Tools/pixi-packages/default/recipe.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
context:
22
# Keep up to date
3-
version: ${{ version }}
4-
variant: ${{ variant }}
53
freethreading_tag: ${{ "t" if "freethreading" in variant else "" }}
6-
abi_tag: ${{ abi_tag }}
74

85
recipe:
96
name: python
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
variant:
2+
- default
3+
abi_tag:
4+
- cp315
5+
version:
6+
- 3.15
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
variant:
2+
- freethreading
3+
abi_tag:
4+
- cp315t
5+
version:
6+
- 3.15
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../default/pixi.toml
File renamed without changes.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
variant:
2+
- tsan-freethreading
3+
abi_tag:
4+
- cp315t
5+
version:
6+
- 3.15

Tools/pixi-packages/tsan_freethreading/pixi.toml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)