From cf573d0b03d2ebc056ae0ef5101e4d94067c9c5b Mon Sep 17 00:00:00 2001 From: Deron Smith Date: Mon, 23 Jun 2025 12:24:25 -0400 Subject: [PATCH 1/3] switched package workflow to cibuildwheel --- .github/workflows/python-package.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index d7dc2f2..7356110 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -58,9 +58,14 @@ jobs: echo "PATH=${PATH}:${HOME}/.cargo/bin" >> "$GITHUB_ENV" rustc --version python -m pip install build setuptools setuptools-rust - - name: Build wheels - run: - python -m build --outdir wheelhouse + - name: Build wheels with cibuildwheel + run: | + python -m pip install --upgrade pip + python -m pip install cibuildwheel==2.22.0 + python -m cibuildwheel --output-dir wheelhouse +# - name: Build wheels +# run: +# python -m build --outdir wheelhouse - uses: actions/upload-artifact@v4 with: name: esat-wheels-${{ matrix.os }}-py${{matrix.python_version}} @@ -83,8 +88,13 @@ jobs: curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable echo "${HOME}/.cargo/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append python -m pip install build setuptools setuptools-rust - - name: Build wheels - run: python -m build --outdir wheelhouse + - name: Build wheels with cibuildwheel + run: | + python -m pip install --upgrade pip + python -m pip install cibuildwheel==2.22.0 + python -m cibuildwheel --output-dir wheelhouse +# - name: Build wheels +# run: python -m build --outdir wheelhouse - uses: actions/upload-artifact@v4 with: name: esat-wheels-windows-py${{matrix.python_version}} From 5f1fde45f0db0694af8418f483eaead09ea3d5e2 Mon Sep 17 00:00:00 2001 From: Deron Smith Date: Mon, 23 Jun 2025 12:30:07 -0400 Subject: [PATCH 2/3] adding specific windows targets for rustup --- .github/workflows/package-publish.yml | 1 + .github/workflows/python-package.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/package-publish.yml b/.github/workflows/package-publish.yml index 264c2e4..b8c9d04 100644 --- a/.github/workflows/package-publish.yml +++ b/.github/workflows/package-publish.yml @@ -61,6 +61,7 @@ jobs: run: | python -m pip install --upgrade pip curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable + rustup target add aarch64-pc-windows-msvc i686-pc-windows-msvc x86_64-pc-windows-msvc echo "${HOME}/.cargo/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append python -m pip install build setuptools setuptools-rust # - name: Build wheels diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7356110..cb59114 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -86,6 +86,7 @@ jobs: run: | python -m pip install --upgrade pip curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable + rustup target add aarch64-pc-windows-msvc i686-pc-windows-msvc x86_64-pc-windows-msvc echo "${HOME}/.cargo/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append python -m pip install build setuptools setuptools-rust - name: Build wheels with cibuildwheel From c1938d826e1a9dc8bf081497cbab52bae56f8e29 Mon Sep 17 00:00:00 2001 From: Deron Smith Date: Mon, 23 Jun 2025 12:40:06 -0400 Subject: [PATCH 3/3] fixed invalid rust target from pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index dfaa360..3339b52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ skip = "cp36-* cp37-* cp-38* cp-313* pp37-* *-manylinux_i686 *_ppc64le *_s390x * linux.before-all = "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal" linux.environment = { PATH="$HOME/.cargo/bin:$PATH" } macos.before-all = "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal" -windows.before-all = "rustup target add aarch64-pc-windows-msvc i586-pc-windows-msvc i686-pc-windows-msvc x86_64-pc-windows-msvc" +windows.before-all = "rustup target add aarch64-pc-windows-msvc i686-pc-windows-msvc x86_64-pc-windows-msvc" [tool.setuptools.dynamic] dependencies = {file = ["requirements.txt"]}