Update CI to using latest emscripten-forge platform and Python version (

#99)
emscripten-forge · Jun 6, 2024 · 12a64fc · 12a64fc
1 parent a1619b8
commit 12a64fc
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -10,7 +10,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     env:
-      TARGET_PLATFORM: emscripten-32
+      TARGET_PLATFORM: emscripten-wasm32
       GITHUB_OWNER: "emscripten-forge"
 
     steps:

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -11,7 +11,7 @@ jobs:
   test_empack:
     runs-on: ubuntu-latest
     env:
-      TARGET_PLATFORM: emscripten-32
+      TARGET_PLATFORM: emscripten-wasm32
       GITHUB_OWNER: 'emscripten-forge'
 
     strategy:

diff --git a/empack/cli/repodata.py b/empack/cli/repodata.py
@@ -14,9 +14,9 @@
 @repodata_app.command()
 def shrink(
     arch: str = typer.Option(  # noqa: B008
-        "https://beta.mamba.pm/get/emscripten-forge/emscripten-32/repodata.json.bz2--arch",
+        "https://beta.mamba.pm/get/emscripten-forge/emscripten-wasm32/repodata.json.bz2--arch",
         "-a",
-        help="arch / emscripten-32 repodata",
+        help="arch / emscripten-wasm32 repodata",
     ),
     no_arch: str = typer.Option(  # noqa: B008
         "https://beta.mamba.pm/get/conda-forge/noarch/repodata.json.bz2",

diff --git a/empack/pack.py b/empack/pack.py
@@ -96,7 +96,7 @@ def pack_pkg(
             micromamba_exe=micromamba_exe,
             channels=channels,
             no_deps=True,
-            platform="emscripten-32",
+            platform="emscripten-wasm32",
         )
 
         # filter the env

diff --git a/empack/repodata.py b/empack/repodata.py
@@ -68,7 +68,7 @@ def download_and_shrink_repodata(repodata_urls, outdir=None):
     # download
     repodata_urls[
         "arch"
-    ] = "https://beta.mamba.pm/get/emscripten-forge/emscripten-32/repodata.json.bz2"
+    ] = "https://beta.mamba.pm/get/emscripten-forge/emscripten-wasm32/repodata.json.bz2"
 
     repodata_urls["noarch"] = "https://beta.mamba.pm/get/conda-forge/noarch/repodata.json.bz2"
     repodata_response = {k: requests.get(url, timeout=10) for k, url in repodata_urls.items()}
@@ -99,7 +99,7 @@ def download_and_shrink_repodata(repodata_urls, outdir=None):
 
 if __name__ == "__main__":
     repodata_urls = {
-        "arch": "https://beta.mamba.pm/get/emscripten-forge/emscripten-32/repodata.json.bz2",
+        "arch": "https://beta.mamba.pm/get/emscripten-forge/emscripten-wasm32/repodata.json.bz2",
         "noarch": "https://beta.mamba.pm/get/conda-forge/noarch/repodata.json.bz2",
     }
 

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -25,7 +25,7 @@ def test_pack_env(self, tmp_path, use_cache):
             packages=["numpy"],
             channels=CHANNELS,
             relocate_prefix="/",
-            platform="emscripten-32",
+            platform="emscripten-wasm32",
         )
 
         use_cache_arg = "--use-cache" if use_cache else "--no-use-cache"

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -22,7 +22,7 @@ def test_integration(tmp_path, tmp_path_module, free_port, backend_type):
         packages=packages,
         channels=CHANNELS,
         relocate_prefix="/",
-        platform="emscripten-32",
+        platform="emscripten-wasm32",
     )
 
     script_dir = tmp_path / "scripts"

diff --git a/tests/test_pack.py b/tests/test_pack.py
@@ -13,7 +13,7 @@
 
 # we use the python 3.10 package twice since we want
 # to test if the caching code path is working
-@pytest.mark.parametrize("pkg_spec", ["python=3.10", "numpy", "python=3.10"])
+@pytest.mark.parametrize("pkg_spec", ["python=3.11", "numpy"])
 @pytest.mark.parametrize("use_cache", [False, True])
 def test_pack_pkg(tmp_path, tmp_path_module, use_cache, pkg_spec):
     pkg_name = pkg_spec.split("=")[0]
@@ -58,10 +58,10 @@ def test_append(tmp_path):
     # create and pack env
     create_environment(
         prefix=prefix,
-        packages=["python=3.10", "numpy"],
+        packages=["python=3.11", "numpy"],
         channels=CHANNELS,
         relocate_prefix="/",
-        platform="emscripten-32",
+        platform="emscripten-wasm32",
     )
 
     pack_env(
@@ -101,7 +101,7 @@ def test_append(tmp_path):
     assert "packaged_dir.tar.gz" in env_meta_dict
 
 
-@pytest.mark.parametrize("packages", [["python=3.10", "numpy"]])
+@pytest.mark.parametrize("packages", [["python=3.11", "numpy"]])
 @pytest.mark.parametrize("relocate_prefix", ["/", "/some/dir", "/home/some_dir/"])
 def test_pack_env(tmp_path, packages, relocate_prefix):
     # create the env at the temporary location
@@ -112,7 +112,7 @@ def test_pack_env(tmp_path, packages, relocate_prefix):
         packages=packages,
         channels=CHANNELS,
         relocate_prefix=relocate_prefix,
-        platform="emscripten-32",
+        platform="emscripten-wasm32",
     )
 
     pack_env(