From 8e288a26f5161f360b8f1b455508564129ba75f8 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:03:05 -0300 Subject: [PATCH 01/15] fix: update pyproject to install rust for py13 --- pyproject.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 564b1d4a..db964c24 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,9 +41,13 @@ env = [ packages = ["codecov_cli"] [tool.cibuildwheel] -skip = ["pp*", "cp313-*"] +skip = "pp*" test-command = "codecovcli --help" +[[tool.cibuildwheel.overrides]] +select = "cp313*" +before-test = "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh" + [tool.cibuildwheel.config-settings] pure-python = "false" From 1bcf1da456aac50c483a6f4c3f9f035f45e478d1 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:03:46 -0300 Subject: [PATCH 02/15] fix: run pypi --- .github/workflows/build_for_pypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_for_pypi.yml b/.github/workflows/build_for_pypi.yml index 72a4456a..1acb6556 100644 --- a/.github/workflows/build_for_pypi.yml +++ b/.github/workflows/build_for_pypi.yml @@ -2,6 +2,7 @@ name: Build for PyPi on: + pull_request: workflow_call: inputs: publish: From 09e1ab6c9b6fa89e830c7e5dadae1072368b2f5e Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:07:55 -0300 Subject: [PATCH 03/15] fix: make it default --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index db964c24..be421da5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ test-command = "codecovcli --help" [[tool.cibuildwheel.overrides]] select = "cp313*" -before-test = "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh" +before-test = "curl https://sh.rustup.rs -sSf | sh -s -- -y" [tool.cibuildwheel.config-settings] pure-python = "false" From 19eae0b37fe7cf1f3d120d3f5909a13008afba93 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:13:15 -0300 Subject: [PATCH 04/15] fix: source the shell --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index be421da5..7c042ec7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ test-command = "codecovcli --help" [[tool.cibuildwheel.overrides]] select = "cp313*" -before-test = "curl https://sh.rustup.rs -sSf | sh -s -- -y" +before-test = "curl https://sh.rustup.rs -sSf | sh -s -- -y; . \"$HOME/.cargo/env\"" [tool.cibuildwheel.config-settings] pure-python = "false" From c16681985893a552aaff5806d42e144ac48cd6e5 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:20:01 -0300 Subject: [PATCH 05/15] fix: separate out the commands --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7c042ec7..8415eb27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,10 @@ test-command = "codecovcli --help" [[tool.cibuildwheel.overrides]] select = "cp313*" -before-test = "curl https://sh.rustup.rs -sSf | sh -s -- -y; . \"$HOME/.cargo/env\"" +before-test = [ + "curl https://sh.rustup.rs -sSf | sh -s -- -y", + ". \"$HOME/.cargo/env\"", +] [tool.cibuildwheel.config-settings] pure-python = "false" From a867556797811e119762a04e24f15ae7663ef5a1 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:28:14 -0300 Subject: [PATCH 06/15] fix: install rust --- .github/workflows/build_for_pypi.yml | 2 ++ pyproject.toml | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_for_pypi.yml b/.github/workflows/build_for_pypi.yml index 1acb6556..94b006d7 100644 --- a/.github/workflows/build_for_pypi.yml +++ b/.github/workflows/build_for_pypi.yml @@ -55,6 +55,8 @@ jobs: run: | echo "sdist_filename=$(ls dist/)" >> "${GITHUB_OUTPUT}" shell: bash + - name: Setup Rust + uses: actions-rust-lang/setup-rust-toolchain@v1 - name: Build wheels uses: pypa/cibuildwheel@v2.22.0 with: diff --git a/pyproject.toml b/pyproject.toml index 8415eb27..1859d302 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,13 +44,6 @@ packages = ["codecov_cli"] skip = "pp*" test-command = "codecovcli --help" -[[tool.cibuildwheel.overrides]] -select = "cp313*" -before-test = [ - "curl https://sh.rustup.rs -sSf | sh -s -- -y", - ". \"$HOME/.cargo/env\"", -] - [tool.cibuildwheel.config-settings] pure-python = "false" From cab5b2634409dfa2a6b2d3be34ea6dfb04c1e50a Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:33:48 -0300 Subject: [PATCH 07/15] fix: try more things --- .github/workflows/build_for_pypi.yml | 2 -- pyproject.toml | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_for_pypi.yml b/.github/workflows/build_for_pypi.yml index 94b006d7..1acb6556 100644 --- a/.github/workflows/build_for_pypi.yml +++ b/.github/workflows/build_for_pypi.yml @@ -55,8 +55,6 @@ jobs: run: | echo "sdist_filename=$(ls dist/)" >> "${GITHUB_OUTPUT}" shell: bash - - name: Setup Rust - uses: actions-rust-lang/setup-rust-toolchain@v1 - name: Build wheels uses: pypa/cibuildwheel@v2.22.0 with: diff --git a/pyproject.toml b/pyproject.toml index 1859d302..1e2845c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,6 +44,16 @@ packages = ["codecov_cli"] skip = "pp*" test-command = "codecovcli --help" +[[tool.cibuildwheel.overrides]] +select = "cp313*" +before-test = [ + "curl https://sh.rustup.rs -sSf | sh -s -- -y", + "echo $HOME", + "cat $HOME/.cargo/env", + ". $HOME/.cargo/env", + ". \"$HOME/.cargo/env\"", +] + [tool.cibuildwheel.config-settings] pure-python = "false" From 6c3bad06499c18822b163ceca0d7fae1021469cf Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:39:36 -0300 Subject: [PATCH 08/15] fix: exec bash --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 1e2845c6..0e92f45c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,6 +52,7 @@ before-test = [ "cat $HOME/.cargo/env", ". $HOME/.cargo/env", ". \"$HOME/.cargo/env\"", + "exec bash", ] [tool.cibuildwheel.config-settings] From 781d3a6fba64e8ea9fd3ab455f2e0ac6e76da6bb Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 20 Feb 2025 19:54:03 -0300 Subject: [PATCH 09/15] fix: update things for windows --- pyproject.toml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0e92f45c..db7cd604 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,13 +48,20 @@ test-command = "codecovcli --help" select = "cp313*" before-test = [ "curl https://sh.rustup.rs -sSf | sh -s -- -y", - "echo $HOME", - "cat $HOME/.cargo/env", - ". $HOME/.cargo/env", ". \"$HOME/.cargo/env\"", + "echo \"Restarting the shell, this step takes awhile.\"", "exec bash", ] +[[tool.cibuildwheel.overrides]] +select = "cp313*win*" +before-test = [ + "curl https://sh.rustup.rs -sSf | sh -s -- -y", + "echo \"Restarting the shell, this step takes awhile.\"", + "exec bash", +] +%USERPROFILE%\.cargo\bin + [tool.cibuildwheel.config-settings] pure-python = "false" From 88fbb93e7f0deb7bad76447a5dc5e0e0ec7d7aa3 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Mon, 3 Mar 2025 16:31:40 -0300 Subject: [PATCH 10/15] fix: comment out --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7b50ea1e..1654ec1c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ before-test = [ "echo \"Restarting the shell, this step takes awhile.\"", "exec bash", ] -%USERPROFILE%\.cargo\bin +# %USERPROFILE%\.cargo\bin [tool.cibuildwheel.config-settings] pure-python = "false" From 6d009728fb38a47916a603f953f8a190f470fa37 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Mon, 3 Mar 2025 17:15:10 -0300 Subject: [PATCH 11/15] fix: use rust things --- pyproject.toml | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1654ec1c..0ee908f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,26 +44,18 @@ packages = ["codecov_cli"] skip = "pp*" test-command = "codecovcli --help" -[[tool.cibuildwheel.overrides]] -select = "cp313*" -before-test = [ - "curl https://sh.rustup.rs -sSf | sh -s -- -y", - ". \"$HOME/.cargo/env\"", - "echo \"Restarting the shell, this step takes awhile.\"", - "exec bash", -] - -[[tool.cibuildwheel.overrides]] -select = "cp313*win*" -before-test = [ - "curl https://sh.rustup.rs -sSf | sh -s -- -y", - "echo \"Restarting the shell, this step takes awhile.\"", - "exec bash", -] -# %USERPROFILE%\.cargo\bin +[tool.cibuildwheel.linux] +before-test = "curl -sSf https://sh.rustup.rs | sh -s -- -y" [tool.cibuildwheel.config-settings] pure-python = "false" [tool.cibuildwheel.environment] PIP_CONSTRAINT = "requirements.txt" + +[tool.cibuildwheel.environment.linux] +PATH=$HOME/.cargo/bin:$PATH + +[tool.cibuildwheel.windows] +before-test = "rustup target add i686-pc-windows-msvc" + From a7e2148f34552cd7c10fd43770fd6d120928499b Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Mon, 3 Mar 2025 17:34:01 -0300 Subject: [PATCH 12/15] fix: things --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0ee908f9..e0d0b740 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ pure-python = "false" PIP_CONSTRAINT = "requirements.txt" [tool.cibuildwheel.environment.linux] -PATH=$HOME/.cargo/bin:$PATH +PATH = "$HOME/.cargo/bin:$PATH" [tool.cibuildwheel.windows] before-test = "rustup target add i686-pc-windows-msvc" From 5c78bcec912f79791b5f79d943e7fb33497ea757 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Mon, 3 Mar 2025 17:47:59 -0300 Subject: [PATCH 13/15] fix: do it for all --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e0d0b740..82be2f9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ skip = "pp*" test-command = "codecovcli --help" [tool.cibuildwheel.linux] -before-test = "curl -sSf https://sh.rustup.rs | sh -s -- -y" +before-all = "curl -sSf https://sh.rustup.rs | sh -s -- -y" [tool.cibuildwheel.config-settings] pure-python = "false" @@ -57,5 +57,5 @@ PIP_CONSTRAINT = "requirements.txt" PATH = "$HOME/.cargo/bin:$PATH" [tool.cibuildwheel.windows] -before-test = "rustup target add i686-pc-windows-msvc" +before-all = "rustup target add i686-pc-windows-msvc" From 0d1775d32e94c8abf63d0c1a698b3d4c25e1a54c Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Mon, 3 Mar 2025 17:57:48 -0300 Subject: [PATCH 14/15] fix: try updating path --- pyproject.toml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 82be2f9b..b9ba96bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,18 +44,27 @@ packages = ["codecov_cli"] skip = "pp*" test-command = "codecovcli --help" -[tool.cibuildwheel.linux] -before-all = "curl -sSf https://sh.rustup.rs | sh -s -- -y" +[[tool.cibuildwheel.overrides]] +select = "cp313*" +before-test = [ + "curl https://sh.rustup.rs -sSf | sh -s -- -y", + ". \"$HOME/.cargo/env\"", + "echo \"Restarting the shell, this step takes awhile.\"", + "exec bash", +] + +[[tool.cibuildwheel.overrides]] +select = "cp313*win*" +before-test = [ + "curl https://sh.rustup.rs -sSf | sh -s -- -y", + "$env:Path = \"$env:USERPROFILE\\.cargo\\bin\"", + "echo \"Restarting the shell, this step takes awhile.\"", + "exec bash", +] +# %USERPROFILE%\.cargo\bin [tool.cibuildwheel.config-settings] pure-python = "false" [tool.cibuildwheel.environment] PIP_CONSTRAINT = "requirements.txt" - -[tool.cibuildwheel.environment.linux] -PATH = "$HOME/.cargo/bin:$PATH" - -[tool.cibuildwheel.windows] -before-all = "rustup target add i686-pc-windows-msvc" - From b43b3a028196d1990d1b8d29f75a46e1d56cfe0e Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Tue, 4 Mar 2025 11:56:56 -0300 Subject: [PATCH 15/15] fix: update on test-results-parser --- pyproject.toml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b9ba96bb..64138e95 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,25 +44,6 @@ packages = ["codecov_cli"] skip = "pp*" test-command = "codecovcli --help" -[[tool.cibuildwheel.overrides]] -select = "cp313*" -before-test = [ - "curl https://sh.rustup.rs -sSf | sh -s -- -y", - ". \"$HOME/.cargo/env\"", - "echo \"Restarting the shell, this step takes awhile.\"", - "exec bash", -] - -[[tool.cibuildwheel.overrides]] -select = "cp313*win*" -before-test = [ - "curl https://sh.rustup.rs -sSf | sh -s -- -y", - "$env:Path = \"$env:USERPROFILE\\.cargo\\bin\"", - "echo \"Restarting the shell, this step takes awhile.\"", - "exec bash", -] -# %USERPROFILE%\.cargo\bin - [tool.cibuildwheel.config-settings] pure-python = "false"