diff --git a/pixi.toml b/pixi.toml index faeb152ea..8b72abb3b 100644 --- a/pixi.toml +++ b/pixi.toml @@ -12,8 +12,8 @@ platforms = ["osx-arm64", "osx-64", "linux-64"] ############################################ [feature.feature_rattler_build] [feature.feature_rattler_build.dependencies] -rattler-build = ">= 0.18.2" -python = "3.11.*" +rattler-build = ">=0.18.2" +python = "3.12.*" typer = "*" curl = "*" @@ -126,7 +126,7 @@ cmd = [ ############################################ [feature.feature_documentation] [feature.feature_documentation.dependencies] -python = "3.11.*" +python = "3.12.*" mkdocs = ">=1.6.0" mkdocs-material = ">=9.5.2" pip = "*" diff --git a/recipes/recipes/cross-python_emscripten-wasm32/activate-cross-python.sh b/recipes/recipes/cross-python_emscripten-wasm32/activate-cross-python.sh index ed791a6b9..43d8419f4 100644 --- a/recipes/recipes/cross-python_emscripten-wasm32/activate-cross-python.sh +++ b/recipes/recipes/cross-python_emscripten-wasm32/activate-cross-python.sh @@ -1,8 +1,16 @@ #!/bin/bash + +set -ex + OLD_PYTHON=$PYTHON +echo ">>> OLD_PYTHON=$OLD_PYTHON" +echo ">>> Python version:" +$OLD_PYTHON --version + unset PYTHON MYPYTHON=$BUILD_PREFIX/bin/python PY_VER_MAJOR_MINOR=$($MYPYTHON -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))') +echo ">>> MYPYTHON=$MYPYTHON" export EMSDK_PYTHON=$BUILD_PREFIX/bin/python3 @@ -12,8 +20,6 @@ cp $BUILD_PREFIX/bin/python3 $PREFIX/bin - - # this will activate emscripten in case it has not yet been activated source $CONDA_PREFIX/etc/conda/activate.d/emscripten_emscripten-wasm32_activate.sh diff --git a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml index 1a1b797fb..259cf4672 100644 --- a/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml @@ -1,13 +1,13 @@ context: name: cross-python_emscripten-wasm32 - version: "3.11.3" + version: "3.12.0" package: name: ${{ name|lower }} version: ${{ version }} build: - number: 10 + number: 0 requirements: diff --git a/recipes/recipes/cross-python_emscripten-wasm32/recipe_legacy.yaml b/recipes/recipes/cross-python_emscripten-wasm32/recipe_legacy.yaml deleted file mode 100644 index 850dcdd4c..000000000 --- a/recipes/recipes/cross-python_emscripten-wasm32/recipe_legacy.yaml +++ /dev/null @@ -1,32 +0,0 @@ -context: - name: cross-python_emscripten-wasm32 - version: "3.11.3" - -package: - name: '{{ name|lower }}' - version: '{{ version }}' - -# source: -# - path: _sysconfigdata__emscripten_.py - -build: - number: 10 - -requirements: - - run: - - coreutils - - crossenv >=1.2 - - emscripten_emscripten-wasm32 - - rsync - - sed - - python 3.11 - - setuptools #<60.0 - - pip - -about: - home: cross-python - -extra: - recipe-maintainers: - - DerThorsten diff --git a/recipes/recipes_emscripten/rice/recipe.yaml b/recipes/recipes_emscripten/rice/recipe.yaml index 8ecaf4a20..66395d954 100644 --- a/recipes/recipes_emscripten/rice/recipe.yaml +++ b/recipes/recipes_emscripten/rice/recipe.yaml @@ -11,7 +11,7 @@ source: sha256: fb34402bf0f79a900fa02bd7396a35d661165f0975a93aee902e89e59adf045c build: - number: 0 + number: 1 requirements: build: