Skip to content

Commit 12a64fc

Browse files
authored
Update CI to using latest emscripten-forge platform and Python version (#99)
1 parent a1619b8 commit 12a64fc

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
lint:
1111
runs-on: ubuntu-latest
1212
env:
13-
TARGET_PLATFORM: emscripten-32
13+
TARGET_PLATFORM: emscripten-wasm32
1414
GITHUB_OWNER: "emscripten-forge"
1515

1616
steps:

.github/workflows/workflow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
test_empack:
1212
runs-on: ubuntu-latest
1313
env:
14-
TARGET_PLATFORM: emscripten-32
14+
TARGET_PLATFORM: emscripten-wasm32
1515
GITHUB_OWNER: 'emscripten-forge'
1616

1717
strategy:

empack/cli/repodata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
@repodata_app.command()
1515
def shrink(
1616
arch: str = typer.Option( # noqa: B008
17-
"https://beta.mamba.pm/get/emscripten-forge/emscripten-32/repodata.json.bz2--arch",
17+
"https://beta.mamba.pm/get/emscripten-forge/emscripten-wasm32/repodata.json.bz2--arch",
1818
"-a",
19-
help="arch / emscripten-32 repodata",
19+
help="arch / emscripten-wasm32 repodata",
2020
),
2121
no_arch: str = typer.Option( # noqa: B008
2222
"https://beta.mamba.pm/get/conda-forge/noarch/repodata.json.bz2",

empack/pack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def pack_pkg(
9696
micromamba_exe=micromamba_exe,
9797
channels=channels,
9898
no_deps=True,
99-
platform="emscripten-32",
99+
platform="emscripten-wasm32",
100100
)
101101

102102
# filter the env

empack/repodata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def download_and_shrink_repodata(repodata_urls, outdir=None):
6868
# download
6969
repodata_urls[
7070
"arch"
71-
] = "https://beta.mamba.pm/get/emscripten-forge/emscripten-32/repodata.json.bz2"
71+
] = "https://beta.mamba.pm/get/emscripten-forge/emscripten-wasm32/repodata.json.bz2"
7272

7373
repodata_urls["noarch"] = "https://beta.mamba.pm/get/conda-forge/noarch/repodata.json.bz2"
7474
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):
9999

100100
if __name__ == "__main__":
101101
repodata_urls = {
102-
"arch": "https://beta.mamba.pm/get/emscripten-forge/emscripten-32/repodata.json.bz2",
102+
"arch": "https://beta.mamba.pm/get/emscripten-forge/emscripten-wasm32/repodata.json.bz2",
103103
"noarch": "https://beta.mamba.pm/get/conda-forge/noarch/repodata.json.bz2",
104104
}
105105

tests/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_pack_env(self, tmp_path, use_cache):
2525
packages=["numpy"],
2626
channels=CHANNELS,
2727
relocate_prefix="/",
28-
platform="emscripten-32",
28+
platform="emscripten-wasm32",
2929
)
3030

3131
use_cache_arg = "--use-cache" if use_cache else "--no-use-cache"

tests/test_integration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_integration(tmp_path, tmp_path_module, free_port, backend_type):
2222
packages=packages,
2323
channels=CHANNELS,
2424
relocate_prefix="/",
25-
platform="emscripten-32",
25+
platform="emscripten-wasm32",
2626
)
2727

2828
script_dir = tmp_path / "scripts"

tests/test_pack.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
# we use the python 3.10 package twice since we want
1515
# to test if the caching code path is working
16-
@pytest.mark.parametrize("pkg_spec", ["python=3.10", "numpy", "python=3.10"])
16+
@pytest.mark.parametrize("pkg_spec", ["python=3.11", "numpy"])
1717
@pytest.mark.parametrize("use_cache", [False, True])
1818
def test_pack_pkg(tmp_path, tmp_path_module, use_cache, pkg_spec):
1919
pkg_name = pkg_spec.split("=")[0]
@@ -58,10 +58,10 @@ def test_append(tmp_path):
5858
# create and pack env
5959
create_environment(
6060
prefix=prefix,
61-
packages=["python=3.10", "numpy"],
61+
packages=["python=3.11", "numpy"],
6262
channels=CHANNELS,
6363
relocate_prefix="/",
64-
platform="emscripten-32",
64+
platform="emscripten-wasm32",
6565
)
6666

6767
pack_env(
@@ -101,7 +101,7 @@ def test_append(tmp_path):
101101
assert "packaged_dir.tar.gz" in env_meta_dict
102102

103103

104-
@pytest.mark.parametrize("packages", [["python=3.10", "numpy"]])
104+
@pytest.mark.parametrize("packages", [["python=3.11", "numpy"]])
105105
@pytest.mark.parametrize("relocate_prefix", ["/", "/some/dir", "/home/some_dir/"])
106106
def test_pack_env(tmp_path, packages, relocate_prefix):
107107
# create the env at the temporary location
@@ -112,7 +112,7 @@ def test_pack_env(tmp_path, packages, relocate_prefix):
112112
packages=packages,
113113
channels=CHANNELS,
114114
relocate_prefix=relocate_prefix,
115-
platform="emscripten-32",
115+
platform="emscripten-wasm32",
116116
)
117117

118118
pack_env(

0 commit comments

Comments
 (0)