From a0199fcb1807b4576b6a6d73a85539ef47803b23 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 12:14:51 +0100 Subject: [PATCH 01/10] minor changes --- conda_build_config.yaml | 4 +--- recipes/recipes/pytester/recipe.yaml | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 4e087282f..be06d0237 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -9,8 +9,6 @@ c_compiler: then: - clang - - cxx_compiler: - if: emscripten then: @@ -589,7 +587,7 @@ python_impl: # - cpython # [not (osx and arm64)] # - cpython pytester: - - 1.0.12 + - 1.0.18 qt: - 5.12 qtkeychain: diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index 867b9e9eb..991f528fd 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -1,5 +1,5 @@ context: - version: '1.0.14' + version: '1.0.18' source: - path: bin @@ -21,8 +21,8 @@ outputs: host: - python run: - - microsoft::playwright > 1.49.1 - - pyjs_code_runner >= 3.0.0 + - playwright + - pyjs_code_runner >=3.0.0 - package: name: pytester-run From efb7d4209d3d488a5a8a5a8b4ab4aec770725fc8 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 12:19:24 +0100 Subject: [PATCH 02/10] skip all exisiting --- pixi.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pixi.toml b/pixi.toml index 5bbf673cf..c8077737b 100644 --- a/pixi.toml +++ b/pixi.toml @@ -26,7 +26,7 @@ cmd = [ "-c", "https://repo.prefix.dev/emscripten-forge-dev", "-c", "microsoft", "-c", "conda-forge", - "--skip-existing", "local", + "--skip-existing", "all", "-m", "conda_build_config.yaml", "--recipe", "recipes/recipes/emscripten_emscripten-wasm32" @@ -41,7 +41,7 @@ cmd = [ "-c", "https://repo.prefix.dev/emscripten-forge-dev", "-c", "microsoft", "-c", "conda-forge", - "--skip-existing", "local", + "--skip-existing", "all", "-m", "conda_build_config.yaml", "--recipe", "recipes/recipes/cross-python_emscripten-wasm32" @@ -56,7 +56,7 @@ cmd = [ "-c", "https://repo.prefix.dev/emscripten-forge-dev", "-c", "microsoft", "-c", "conda-forge", - "--skip-existing", "local", + "--skip-existing", "all", "-m", "conda_build_config.yaml", "--recipe", "recipes/recipes/pytester" @@ -77,7 +77,7 @@ cmd = [ "-c", "microsoft", "-c", "conda-forge", "--target-platform", "emscripten-wasm32", - "--skip-existing", "local", + "--skip-existing", "all", "-m", "conda_build_config.yaml", "--recipe" ] @@ -91,7 +91,7 @@ cmd = [ "-c", "https://repo.prefix.dev/emscripten-forge-dev", "-c", "microsoft", "-c", "conda-forge", - "--skip-existing", "local", + "--skip-existing", "all", "-m", "conda_build_config.yaml", "--recipe" ] From dbf82a500874b898c967d6d67a1ccd0bd4bc4716 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 12:21:34 +0100 Subject: [PATCH 03/10] skip setup step --- .github/workflows/run_with_pixi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_with_pixi.yaml b/.github/workflows/run_with_pixi.yaml index 6015118ce..7508193ba 100644 --- a/.github/workflows/run_with_pixi.yaml +++ b/.github/workflows/run_with_pixi.yaml @@ -36,6 +36,6 @@ jobs: with: pixi-version: v0.20.1 - run: | - pixi run setup + # pixi run setup pixi run build-emscripten-wasm32-pkg recipes/recipes_emscripten/regex pixi run build-emscripten-wasm32-pkg test_recipes/only_py_tests \ No newline at end of file From 6a573b28c7fa000704aba95ce104cc34a14b3556 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 12:29:55 +0100 Subject: [PATCH 04/10] require newer rattler version: --- ci_env.yml | 2 +- pixi.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci_env.yml b/ci_env.yml index 44dab6281..15ec233c1 100644 --- a/ci_env.yml +++ b/ci_env.yml @@ -5,7 +5,7 @@ dependencies: - python - ruamel.yaml - typer - - rattler-build >=0.18.1 + - rattler-build >=0.34.1 - pixi - jinja2 - curl diff --git a/pixi.toml b/pixi.toml index c8077737b..ff7694371 100644 --- a/pixi.toml +++ b/pixi.toml @@ -12,7 +12,7 @@ platforms = ["osx-arm64", "osx-64", "linux-64"] ############################################ [feature.feature_rattler_build] [feature.feature_rattler_build.dependencies] -rattler-build = ">=0.18.1" +rattler-build = ">=0.34.1" python = "3.11.*" typer = "*" curl = "*" From 1d6d3ee4ebf86a5c7bd93fe5ed8c0f8a8da06b18 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 12:35:31 +0100 Subject: [PATCH 05/10] check direct invocation:] --- recipes/recipes_emscripten/regex/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes_emscripten/regex/recipe.yaml b/recipes/recipes_emscripten/regex/recipe.yaml index a20f759c4..dd0de1b0e 100644 --- a/recipes/recipes_emscripten/regex/recipe.yaml +++ b/recipes/recipes_emscripten/regex/recipe.yaml @@ -11,7 +11,7 @@ source: sha256: 97f32dc03a8054a4c4a5ab5d761ed4861e828b2c200febd4e46857069a483916 build: - number: 9 + number: 10 requirements: build: From a1fb635b7e0f66ce3a20982f7f5dc25b5ff1cde3 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 13:00:24 +0100 Subject: [PATCH 06/10] change pin --- conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index be06d0237..9dfb9ee37 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -575,7 +575,7 @@ pybind11_abi: pip: - '24.0.*' python: - - 3.13.* *_cpython + - 3.13.* *_cp313 # # part of a zip_keys: python, python_impl, numpy # - 3.7.* *_cpython # [not (osx and arm64)] # - 3.8.* *_cpython From 1c4428f812c308f8671eb463b4e046c7b03bac1b Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 13:08:30 +0100 Subject: [PATCH 07/10] unchange --- recipes/recipes_emscripten/python/recipe.yaml | 2 +- recipes/recipes_emscripten/regex/recipe.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes_emscripten/python/recipe.yaml b/recipes/recipes_emscripten/python/recipe.yaml index 03c90180c..cb6d013c6 100644 --- a/recipes/recipes_emscripten/python/recipe.yaml +++ b/recipes/recipes_emscripten/python/recipe.yaml @@ -4,7 +4,7 @@ context: name: python ver2: "3.13" ver2nd: ${{ version | version_to_buildstring}} - build_number: 1 + build_number: 2 abi_tag: "cp${{ ver2nd }}" package: diff --git a/recipes/recipes_emscripten/regex/recipe.yaml b/recipes/recipes_emscripten/regex/recipe.yaml index dd0de1b0e..a20f759c4 100644 --- a/recipes/recipes_emscripten/regex/recipe.yaml +++ b/recipes/recipes_emscripten/regex/recipe.yaml @@ -11,7 +11,7 @@ source: sha256: 97f32dc03a8054a4c4a5ab5d761ed4861e828b2c200febd4e46857069a483916 build: - number: 10 + number: 9 requirements: build: From f2cc7030df4979b7e623ffd338621e7fa21109cf Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 13:11:32 +0100 Subject: [PATCH 08/10] more pinning --- conda_build_config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 9dfb9ee37..2d3f62a67 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -308,6 +308,8 @@ davix: - '0.8' dbus: - 1 +emscripten_emscripten-wasm32: + - 3.1.73 exiv2: - 0.27 expat: @@ -526,7 +528,7 @@ ntl: - '11.4.3' # we build for the oldest version possible of numpy for forward compatibility numpy: - - 1.25.2 + - '2.2' occt: - '7.5' openblas: From eaface46474995cf96903ac430b14d6ae92c91af Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 13:15:29 +0100 Subject: [PATCH 09/10] change pin --- test_recipes/only_py_tests/recipe.yaml | 13 +++-------- test_recipes/only_py_tests/test_it.py | 30 +++++++++++++++----------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/test_recipes/only_py_tests/recipe.yaml b/test_recipes/only_py_tests/recipe.yaml index aae13ad67..ba536e838 100644 --- a/test_recipes/only_py_tests/recipe.yaml +++ b/test_recipes/only_py_tests/recipe.yaml @@ -1,6 +1,6 @@ context: name: only_py_tests - version: "1.0.0" + version: "2.0.0" package: name: ${{ name|lower }} @@ -8,20 +8,13 @@ package: build: - number: 1 + number: 0 requirements: run: - - numpy<2 + - numpy - python - - pandas - - arrow-python - - matplotlib - - pandas - - matplotlib - - scipy - ipython - - arrow-python tests: - script: pytester diff --git a/test_recipes/only_py_tests/test_it.py b/test_recipes/only_py_tests/test_it.py index f932a3010..17b3ecc3e 100644 --- a/test_recipes/only_py_tests/test_it.py +++ b/test_recipes/only_py_tests/test_it.py @@ -1,18 +1,22 @@ -def test_imports(): - import matplotlib.pyplot as plt +# def test_imports(): +# import matplotlib.pyplot as plt - import pandas - from pandas import read_csv, DataFrame +# import pandas +# from pandas import read_csv, DataFrame - import pyarrow as pa +# import pyarrow as pa - import pkgutil - import scipy.interpolate - import scipy +# import pkgutil +# import scipy.interpolate +# import scipy - for submodule in pkgutil.iter_modules(scipy.__path__): - __import__(f"scipy.{submodule.name}") +# for submodule in pkgutil.iter_modules(scipy.__path__): +# __import__(f"scipy.{submodule.name}") - import IPython - from IPython.core.displayhook import DisplayHook - from IPython.core.displaypub import DisplayPublisher +# import IPython +# from IPython.core.displayhook import DisplayHook +# from IPython.core.displaypub import DisplayPublisher + + +def test_import(): + import numpy as np \ No newline at end of file From 24a76c4224b5481ef6e0cf05ff73fd57331d36ec Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 13 Jan 2025 13:18:41 +0100 Subject: [PATCH 10/10] unchange pinning --- recipes/recipes_emscripten/python/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes_emscripten/python/recipe.yaml b/recipes/recipes_emscripten/python/recipe.yaml index cb6d013c6..03c90180c 100644 --- a/recipes/recipes_emscripten/python/recipe.yaml +++ b/recipes/recipes_emscripten/python/recipe.yaml @@ -4,7 +4,7 @@ context: name: python ver2: "3.13" ver2nd: ${{ version | version_to_buildstring}} - build_number: 2 + build_number: 1 abi_tag: "cp${{ ver2nd }}" package: