Skip to content

Dev #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deronsmith merged 3 commits into from
Jun 23, 2025
Merged

Dev #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf573d0
switched package workflow to cibuildwheel
deronsmith Jun 23, 2025
5f1fde4
adding specific windows targets for rustup
deronsmith Jun 23, 2025
c1938d8
fixed invalid rust target from pyproject.toml
deronsmith Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/package-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 16 additions & 5 deletions .github/workflows/python-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

Copilot AI Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider adding an inline comment explaining the switch to cibuildwheel and the rationale for locking to version 2.22.0 to aid future maintainers.

Suggested change
python -m pip install --upgrade pip
python -m pip install --upgrade pip
# Locking cibuildwheel to version 2.22.0 for compatibility and stability reasons.
# Future maintainers should test thoroughly before upgrading to a newer version.

Copilot uses AI. Check for mistakes.
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}}
Expand All @@ -81,10 +86,16 @@ 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
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}}
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
Expand Down
Loading