Skip to content
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

Jump to bottom

Small update to fix maturin and update numpy #17

Merged
merged 8 commits into from
Oct 15, 2024
Merged

Small update to fix maturin and update numpy #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf3b1b6
Merge pull request #16 from SuperDARNCanada/file_errors
RemingtonRohel Oct 11, 2024
f9e0d0b
Bumpy numpy version to support `numpy>2`
RemingtonRohel Oct 11, 2024
f1b9439
Patch for broken maturin-action.
RemingtonRohel Oct 11, 2024
fde8984
Attempting CI fix using solution of https://github.com/sfackler/rust-…
RemingtonRohel Oct 11, 2024
5f6c5b9
Another crack at Github actions failure
RemingtonRohel Oct 15, 2024
f3f8a8f
Disable sccache in CI.yml
RemingtonRohel Oct 15, 2024
ab933bd
sccache still failed - another attempt at disabling
RemingtonRohel Oct 15, 2024
5cdb106
Merge branch 'main' into develop
RemingtonRohel Oct 15, 2024
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
16 changes: 12 additions & 4 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ jobs:
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --zig
sccache: 'true'
sccache: 'false'
manylinux: auto
before-script-linux: |
sudo apt update -y && sudo apt-get install -y libssl-dev openssl pkg-config
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -79,7 +81,7 @@ jobs:
with:
target: ${{ matrix.platform.target }}
args: --release --out dist
sccache: 'true'
sccache: 'false'
manylinux: musllinux_1_2
- name: Upload wheels
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -108,7 +110,7 @@ jobs:
with:
target: ${{ matrix.platform.target }}
args: --release --out dist
sccache: 'true'
sccache: 'false'
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
Expand All @@ -135,7 +137,7 @@ jobs:
with:
target: ${{ matrix.platform.target }}
args: --release --out dist
sccache: 'true'
sccache: 'false'
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
Expand All @@ -146,6 +148,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Build sdist
uses: PyO3/maturin-action@v1
with:
Expand All @@ -167,6 +172,9 @@ jobs:
environment: release
steps:
- uses: actions/download-artifact@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Publish to PyPI
uses: PyO3/maturin-action@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ name = "dmap"
crate-type = ["cdylib", "rlib"]

[dependencies]
pyo3 = { version = "0.21.0", features = ["extension-module", "indexmap", "abi3-py38"] }
numpy = "0.21.0"
pyo3 = { version = "0.22.3", features = ["extension-module", "indexmap", "abi3-py38"] }
numpy = "0.22.0"
indexmap = "2.3.0"
itertools = "0.13.0"
rayon = "1.10.0"
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 @@ -13,7 +13,7 @@ classifiers = [
"Programming Language :: Python",
"Programming Language :: Rust"
]
dependencies = ["numpy<2"]
dependencies = ["numpy<3"]

[tool.maturin]
bindings = "pyo3"
Expand Down