From 3d00fdb932566df64de28c2dbf7eaefdd5b04f5e Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 28 May 2024 00:13:44 -0400 Subject: [PATCH 1/8] ci: bump to Pyodide 3.12 Signed-off-by: Henry Schreiner --- .github/workflows/emscripten.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index c3d37f28..d700d30d 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -26,11 +26,11 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" - name: Install pyodide-build run: | - pip install pyodide-build==0.25.1 + pip install pyodide-build==0.26.0 echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV - uses: mymindstorm/setup-emsdk@v14 From f0c3f9bdb30190e50e3b840d09058acc7b0ff7f1 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 28 May 2024 00:21:15 -0400 Subject: [PATCH 2/8] ci: work around noisy pyodide config Signed-off-by: Henry Schreiner --- .github/workflows/emscripten.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index d700d30d..da185610 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -31,7 +31,7 @@ jobs: - name: Install pyodide-build run: | pip install pyodide-build==0.26.0 - echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV + echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version | tail -n 1 | awk '{print $NF}') >> $GITHUB_ENV - uses: mymindstorm/setup-emsdk@v14 with: From 4788fdd57de051ff05218cd12b6e737f5a482204 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 7 Jun 2024 23:33:48 -0400 Subject: [PATCH 3/8] Apply suggestions from code review --- .github/workflows/emscripten.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index da185610..9bc9632b 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -30,8 +30,8 @@ jobs: - name: Install pyodide-build run: | - pip install pyodide-build==0.26.0 - echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version | tail -n 1 | awk '{print $NF}') >> $GITHUB_ENV + pip install pyodide-build==0.26.1 + echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version >> $GITHUB_ENV - uses: mymindstorm/setup-emsdk@v14 with: From dbb23b692afd714839803129dc9602f60ef62ad7 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 7 Jun 2024 23:34:04 -0400 Subject: [PATCH 4/8] Update .github/workflows/emscripten.yaml --- .github/workflows/emscripten.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index 9bc9632b..64ee13c7 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -31,7 +31,7 @@ jobs: - name: Install pyodide-build run: | pip install pyodide-build==0.26.1 - echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version >> $GITHUB_ENV + echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV - uses: mymindstorm/setup-emsdk@v14 with: From 8fa0a8c4f1dfebe32160cb5443a89b8e3d669357 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 7 Jun 2024 23:46:28 -0400 Subject: [PATCH 5/8] refactor: try pyproject.toml --- .github/workflows/emscripten.yaml | 2 +- pyproject.toml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index 64ee13c7..f8163194 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -39,7 +39,7 @@ jobs: actions-cache-folder: emsdk-cache - name: Build - run: CFLAGS=-fexceptions LDFLAGS=-fexceptions pyodide build --exports whole_archive + run: pyodide build --exports whole_archive - uses: actions/setup-node@v4 with: diff --git a/pyproject.toml b/pyproject.toml index b7b9914d..b41597c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -117,6 +117,11 @@ sdist.exclude = [ write_to = "src/boost_histogram/version.py" +[tool.pyodide.build] +cflags = ["-fexceptions"] +ldflags = ["-fexceptions"] + + [tool.pytest.ini_options] minversion = "6.0" junit_family = "xunit2" From 70e2544a848505dc90331a593f6e47196c5574c8 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 8 Jun 2024 00:03:11 -0400 Subject: [PATCH 6/8] Update pyproject.toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b41597c9..254a25a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -118,8 +118,8 @@ write_to = "src/boost_histogram/version.py" [tool.pyodide.build] -cflags = ["-fexceptions"] -ldflags = ["-fexceptions"] +cflags = "-fexceptions" +ldflags = "-fexceptions" [tool.pytest.ini_options] From a77277ac14f511b84d966c472acded3c6fea3d03 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 8 Jun 2024 00:07:06 -0400 Subject: [PATCH 7/8] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 254a25a8..0e4859af 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -118,7 +118,7 @@ write_to = "src/boost_histogram/version.py" [tool.pyodide.build] -cflags = "-fexceptions" +cxxflags = "-fexceptions" ldflags = "-fexceptions" From 36c637c3f4412e24602bcec37e4cb6abf823da14 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 8 Jun 2024 00:24:04 -0400 Subject: [PATCH 8/8] Apply suggestions from code review --- .github/workflows/emscripten.yaml | 2 +- pyproject.toml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index f8163194..12b8d6e6 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -39,7 +39,7 @@ jobs: actions-cache-folder: emsdk-cache - name: Build - run: pyodide build --exports whole_archive + run: CXXFLAGS=-fexceptions LDFLAGS=-fexceptions pyodide build --exports whole_archive - uses: actions/setup-node@v4 with: diff --git a/pyproject.toml b/pyproject.toml index 0e4859af..b7b9914d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -117,11 +117,6 @@ sdist.exclude = [ write_to = "src/boost_histogram/version.py" -[tool.pyodide.build] -cxxflags = "-fexceptions" -ldflags = "-fexceptions" - - [tool.pytest.ini_options] minversion = "6.0" junit_family = "xunit2"