Skip to content

Commit 369c644

Browse files
committed
Remove duplicated recipe.yaml
Since prefix-dev/pixi#5364 has been merged, we can remove the duplicated recipe.yaml files.
1 parent 09233bd commit 369c644

File tree

9 files changed

+20
-287
lines changed

9 files changed

+20
-287
lines changed

Tools/pixi-packages/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ Each package definition is contained in a subdirectory, but they share the build
3636

3737
- More package variants (such as UBSan)
3838
- Support for Windows
39-
- Using a single `pixi.toml` and `recipe.yaml` for all package variants is blocked on
40-
[pixi#5364](https://github.com/prefix-dev/pixi/pull/5364)
41-
and [pixi#5248](https://github.com/prefix-dev/pixi/issues/5248)
39+
- Using a single `pixi.toml` for all package variants is blocked on
40+
[pixi#5248](https://github.com/prefix-dev/pixi/issues/5248)
4241

4342
## Troubleshooting
4443

@@ -48,7 +47,7 @@ FATAL: ThreadSanitizer: unexpected memory mapping 0x7977bd072000-0x7977bd500000
4847
```
4948
To fix it, try reducing `mmap_rnd_bits`:
5049

51-
```bash
50+
```console
5251
$ sudo sysctl vm.mmap_rnd_bits
5352
vm.mmap_rnd_bits = 32 # too high for TSan
5453
$ sudo sysctl vm.mmap_rnd_bits=28 # reduce it

Tools/pixi-packages/asan/pixi.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
channels = ["https://prefix.dev/conda-forge"]
66
platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64"]
77
preview = ["pixi-build"]
8+
requires-pixi = ">=0.66.0"
89

910
[package.build.backend]
1011
name = "pixi-build-rattler-build"
1112
version = "*"
13+
14+
[package.build.config]
15+
recipe = "../default/recipe.yaml"

Tools/pixi-packages/asan/recipe.yaml

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

Tools/pixi-packages/clone-recipe.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ set -o errexit
66
cd "$(dirname "$0")"
77

88
for variant in asan freethreading tsan-freethreading; do
9-
cp -av default/recipe.yaml default/pixi.toml ${variant}/
9+
cp -av default/pixi.toml ${variant}/
1010
done

Tools/pixi-packages/default/pixi.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
channels = ["https://prefix.dev/conda-forge"]
66
platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64"]
77
preview = ["pixi-build"]
8+
requires-pixi = ">=0.66.0"
89

910
[package.build.backend]
1011
name = "pixi-build-rattler-build"
1112
version = "*"
13+
14+
[package.build.config]
15+
recipe = "../default/recipe.yaml"

Tools/pixi-packages/freethreading/pixi.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
channels = ["https://prefix.dev/conda-forge"]
66
platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64"]
77
preview = ["pixi-build"]
8+
requires-pixi = ">=0.66.0"
89

910
[package.build.backend]
1011
name = "pixi-build-rattler-build"
1112
version = "*"
13+
14+
[package.build.config]
15+
recipe = "../default/recipe.yaml"

Tools/pixi-packages/freethreading/recipe.yaml

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

Tools/pixi-packages/tsan-freethreading/pixi.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
channels = ["https://prefix.dev/conda-forge"]
66
platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64"]
77
preview = ["pixi-build"]
8+
requires-pixi = ">=0.66.0"
89

910
[package.build.backend]
1011
name = "pixi-build-rattler-build"
1112
version = "*"
13+
14+
[package.build.config]
15+
recipe = "../default/recipe.yaml"

Tools/pixi-packages/tsan-freethreading/recipe.yaml

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

0 commit comments

Comments
 (0)