From dec4dceb87bc218cc87311dc424d95ecf2c60331 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 20 Oct 2023 11:43:53 +0200 Subject: [PATCH] move recipes --- .github/workflows/build_recipes.yaml | 22 +++++++++---------- builder.py | 9 -------- .../recipes_emscripten/arrow-python/build.sh | 8 +++++-- .../arrow-python/recipe.yaml | 2 +- .../gmpy2/build.sh | 0 .../gmpy2/recipe.yaml | 0 .../gmpy2/test_gmpy2.py | 0 .../mpc/build.sh | 0 .../mpc/recipe.yaml | 0 9 files changed, 18 insertions(+), 23 deletions(-) rename recipes/{recipes_emscripten => recipes_emscripten_unbuild}/gmpy2/build.sh (100%) rename recipes/{recipes_emscripten => recipes_emscripten_unbuild}/gmpy2/recipe.yaml (100%) rename recipes/{recipes_emscripten => recipes_emscripten_unbuild}/gmpy2/test_gmpy2.py (100%) rename recipes/{recipes_emscripten => recipes_emscripten_unbuild}/mpc/build.sh (100%) rename recipes/{recipes_emscripten => recipes_emscripten_unbuild}/mpc/recipe.yaml (100%) diff --git a/.github/workflows/build_recipes.yaml b/.github/workflows/build_recipes.yaml index 91f1d8b4e..9a4effb87 100644 --- a/.github/workflows/build_recipes.yaml +++ b/.github/workflows/build_recipes.yaml @@ -142,16 +142,16 @@ jobs: mkdir -p ${CONDA_PREFIX}/conda-bld/emscripten-wasm32 mkdir -p ${CONDA_PREFIX}/conda-bld/linux-64 mkdir -p ${CONDA_PREFIX}/conda-bld/noarch + + + # if [ $(ls ${CONDA_PREFIX}/conda-bld/emscripten-32/*.tar.bz2 | wc -l) -ne 0 ]; then + # QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client https://beta.mamba.pm/channels/emscripten-forge ${CONDA_PREFIX}/conda-bld/emscripten-wasm32/*.tar.bz2 + # fi + # if [ $(ls ${CONDA_PREFIX}/conda-bld/linux-64/*.tar.bz2 | wc -l) -ne 0 ]; then + # QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client https://beta.mamba.pm/channels/emscripten-forge ${CONDA_PREFIX}/conda-bld/linux-64/*.tar.bz2 + # fi - if [ $(ls ${CONDA_PREFIX}/conda-bld/emscripten-32/*.tar.bz2 | wc -l) -ne 0 ]; then - QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client https://beta.mamba.pm/channels/emscripten-forge ${CONDA_PREFIX}/conda-bld/emscripten-wasm32/*.tar.bz2 - fi - - if [ $(ls ${CONDA_PREFIX}/conda-bld/linux-64/*.tar.bz2 | wc -l) -ne 0 ]; then - QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client https://beta.mamba.pm/channels/emscripten-forge ${CONDA_PREFIX}/conda-bld/linux-64/*.tar.bz2 - fi - - if [ $(ls ${CONDA_PREFIX}/conda-bld/noarch/*.tar.bz2 | wc -l) -ne 0 ]; then - QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client https://beta.mamba.pm/channels/emscripten-forge ${CONDA_PREFIX}/conda-bld/noarch/*.tar.bz2 - fi + # if [ $(ls ${CONDA_PREFIX}/conda-bld/noarch/*.tar.bz2 | wc -l) -ne 0 ]; then + # QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client https://beta.mamba.pm/channels/emscripten-forge ${CONDA_PREFIX}/conda-bld/noarch/*.tar.bz2 + # fi diff --git a/builder.py b/builder.py index b476781dc..3a243e14d 100644 --- a/builder.py +++ b/builder.py @@ -195,7 +195,6 @@ def explicit( assert os.path.isdir(recipe_dir), f"{recipe_dir} is not a dir" platform = "" if emscripten_wasm32: - print("WITH EM") platform = "emscripten-wasm32" boa_build( work_dir=work_dir, @@ -232,14 +231,6 @@ def changed( for recipe_with_change in recipe_with_changes: - if skip_existing and RECIPES_SUBDIR_MAPPING[subdir] == "emscripten-wasm32": - pkg_name = recipe_with_change - print(f"Check if pkg exists: {pkg_name}") - if is_existing_pkg(pkg_name): - print(f"Skip existing pkg: {pkg_name}") - continue - else: - print(f"Build pkg: {pkg_name}") recipe_dir = os.path.join(recipes_dir, subdir, recipe_with_change) # diff can shown deleted recipe as changed diff --git a/recipes/recipes_emscripten/arrow-python/build.sh b/recipes/recipes_emscripten/arrow-python/build.sh index 7142b6200..d5a29df47 100644 --- a/recipes/recipes_emscripten/arrow-python/build.sh +++ b/recipes/recipes_emscripten/arrow-python/build.sh @@ -10,7 +10,7 @@ fi -export INCLUDE_NUMPY_FLAGS="-I$BUILD_PREFIX/lib/python3.10/site-packages/numpy/core/include -I$PREFIX/lib/python3.10/site-packages/numpy/core/include" +export INCLUDE_NUMPY_FLAGS="-I$BUILD_PREFIX/lib/python3.11/site-packages/numpy/core/include -I$PREFIX/lib/python3.11/site-packages/numpy/core/include" export CFLAGS="$CFLAGS $INCLUDE_NUMPY_FLAGS" export CXXFLAGS="$CXXFLAGS $INCLUDE_NUMPY_FLAGS" @@ -21,4 +21,8 @@ export CXXFLAGS="$CXXFLAGS -sWASM_BIGINT" export LDFLAGS="$LDFLAGS -sWASM_BIGINT" cd python -${PYTHON} -m pip install . -vvv \ No newline at end of file +${PYTHON} -m pip install . -vvv + +INIT_PATH=$PREFIX/lib/python3.11/site-packages/pyarrow/__init__.py + +sed -i "s/__version__ = None/__version__ = \"$PKG_VERSION\"/g" $INIT_PATH \ No newline at end of file diff --git a/recipes/recipes_emscripten/arrow-python/recipe.yaml b/recipes/recipes_emscripten/arrow-python/recipe.yaml index c7bda8259..2766cc9ba 100644 --- a/recipes/recipes_emscripten/arrow-python/recipe.yaml +++ b/recipes/recipes_emscripten/arrow-python/recipe.yaml @@ -12,7 +12,7 @@ source: - patches/wasm.patch build: - number: 4 + number: 5 requirements: build: diff --git a/recipes/recipes_emscripten/gmpy2/build.sh b/recipes/recipes_emscripten_unbuild/gmpy2/build.sh similarity index 100% rename from recipes/recipes_emscripten/gmpy2/build.sh rename to recipes/recipes_emscripten_unbuild/gmpy2/build.sh diff --git a/recipes/recipes_emscripten/gmpy2/recipe.yaml b/recipes/recipes_emscripten_unbuild/gmpy2/recipe.yaml similarity index 100% rename from recipes/recipes_emscripten/gmpy2/recipe.yaml rename to recipes/recipes_emscripten_unbuild/gmpy2/recipe.yaml diff --git a/recipes/recipes_emscripten/gmpy2/test_gmpy2.py b/recipes/recipes_emscripten_unbuild/gmpy2/test_gmpy2.py similarity index 100% rename from recipes/recipes_emscripten/gmpy2/test_gmpy2.py rename to recipes/recipes_emscripten_unbuild/gmpy2/test_gmpy2.py diff --git a/recipes/recipes_emscripten/mpc/build.sh b/recipes/recipes_emscripten_unbuild/mpc/build.sh similarity index 100% rename from recipes/recipes_emscripten/mpc/build.sh rename to recipes/recipes_emscripten_unbuild/mpc/build.sh diff --git a/recipes/recipes_emscripten/mpc/recipe.yaml b/recipes/recipes_emscripten_unbuild/mpc/recipe.yaml similarity index 100% rename from recipes/recipes_emscripten/mpc/recipe.yaml rename to recipes/recipes_emscripten_unbuild/mpc/recipe.yaml