From 717fcf9a0ed99033965821a6a8197e2fa15d1748 Mon Sep 17 00:00:00 2001 From: Eric Joanis Date: Mon, 19 Aug 2024 14:50:08 -0400 Subject: [PATCH 1/5] fix: generate py39 wheels too The absence of soundswallower-0.6.4-cp39-cp39-win_amd64.whl on pypi means I (and therefore Studio CLI users) cannot install ReadAlongs/Studio on my windows machine using Python 3.9 without installing the MS Visual Studio compiler. So add py39 wheels to pyproject.toml so they're generated next time we release. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index e2ca1da..ee96eb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,6 +42,7 @@ soundswallower = "soundswallower.cli:main" # Build a reduced selection of binaries as there are tons of them build = [ "cp38-*", + "cp39-*", "cp310-*", "cp311-*", "cp312-*", From d5ea04ea3fc45ea63027b2638546ff5680433307 Mon Sep 17 00:00:00 2001 From: Eric Joanis Date: Mon, 19 Aug 2024 15:21:07 -0400 Subject: [PATCH 2/5] ci: fix deprecated node warnings --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a18cb06..35a8c3f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install run: | sudo apt-get install sox ninja-build @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install run: | pip3 install -r requirements.dev.txt @@ -37,7 +37,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install run: | pip3 install -r requirements.dev.txt @@ -48,7 +48,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install run: | pip3 install -r requirements.dev.txt @@ -59,9 +59,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Build Dependencies - uses: mymindstorm/setup-emsdk@v12 + uses: mymindstorm/setup-emsdk@v14 - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build run: | emcmake cmake -S . -B jsbuild From 279781c5c5b1f464904f889d28de0f42a2557a3e Mon Sep 17 00:00:00 2001 From: Eric Joanis Date: Mon, 19 Aug 2024 15:22:02 -0400 Subject: [PATCH 3/5] ci: fix macos job by using actions/setup-python --- .github/workflows/tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 35a8c3f..4b4af14 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -49,12 +49,13 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - name: Install run: | - pip3 install -r requirements.dev.txt - pip3 install . + pip install -r requirements.dev.txt + pip install . - name: Run tests - run: python3 -m pytest + run: python -m pytest nodetest: runs-on: ubuntu-latest steps: From da157c4aa337442fc4df115a9e58549426559595 Mon Sep 17 00:00:00 2001 From: David Huggins-Daines Date: Mon, 19 Aug 2024 16:16:19 -0400 Subject: [PATCH 4/5] fix: maybe fix node? --- js/linker_options.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/js/linker_options.txt b/js/linker_options.txt index 0dc1d52..61d3819 100644 --- a/js/linker_options.txt +++ b/js/linker_options.txt @@ -6,4 +6,3 @@ -sSTRICT=1 -sSTRICT_JS=0 -sSUPPORT_LONGJMP=0 ---memory-init-file=0 From 906ac27735585524638373a72761cb51844dc1a7 Mon Sep 17 00:00:00 2001 From: David Huggins-Daines Date: Mon, 19 Aug 2024 16:21:57 -0400 Subject: [PATCH 5/5] fix: vade retro node.js evil version pinning argh --- js/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/js/package.json b/js/package.json index ad63bcb..ad9f1ce 100644 --- a/js/package.json +++ b/js/package.json @@ -40,6 +40,7 @@ "homepage": "https://github.com/ReadAlongs/SoundSwallower#readme", "devDependencies": { "@types/node": "^18.0.3", + "@types/markdown-it": "^14.1.1", "chai": "^4.3.7", "jsdoc": "^3.6.10", "mocha": "^10.0.0",