Skip to content

Support ndarray 0.16 #439

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.

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
merged 8 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 3 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,7 @@ jobs:
run: |
import toml
cargo_toml = toml.load("Cargo.toml")
cargo_toml["dependencies"]["ndarray"] = "0.13.1"
cargo_toml["dependencies"]["parking_lot"] = "0.11.2"
cargo_toml["dependencies"]["num-complex"] = "0.2.4"
cargo_toml["dependencies"]["once_cell"] = "1.14.0"
cargo_toml["dependencies"]["ndarray"] = "0.15.6"
with open("Cargo.toml", "w") as f:
toml.dump(cargo_toml, f)
working-directory: examples/simple
Expand All @@ -225,12 +222,8 @@ jobs:
cargo_lock = toml.load("Cargo.lock")
for pkg in cargo_lock["package"]:
pkg_id = pkg["name"] + ":" + pkg["version"]
if pkg["name"] == "ndarray" and pkg["version"] != "0.13.1":
subprocess.run(["cargo", "update", "--package", pkg_id, "--precise", "0.13.1"], check=True)
elif pkg["name"] == "parking_lot" and pkg["version"] != "0.11.2":
subprocess.run(["cargo", "update", "--package", pkg_id, "--precise", "0.11.2"], check=True)
elif pkg["name"] == "once_cell" and pkg["version"] != "1.14.0":
subprocess.run(["cargo", "update", "--package", pkg_id, "--precise", "1.14.0"], check=True)
if pkg["name"] == "ndarray" and pkg["version"] != "0.15.6":
subprocess.run(["cargo", "update", "--package", pkg_id, "--precise", "0.15.6"], check=True)
working-directory: examples/simple
shell: python
- name: Test example
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ nalgebra = { version = "0.32", default-features = false, optional = true }
num-complex = ">= 0.2, < 0.5"
num-integer = "0.1"
num-traits = "0.2"
ndarray = ">= 0.13, < 0.16"
ndarray = ">= 0.15, < 0.17"
pyo3 = { version = "0.21.0", default-features = false, features = ["macros"] }
rustc-hash = "1.1"

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,17 @@ For example, if you specify the following dependencies

```toml
numpy = "0.21"
ndarray = "0.13"
ndarray = "0.15"
```

this will currently depend on both version `0.13.1` and `0.15.3` of `ndarray` by default
even though `0.13.1` is within the range `>= 0.13, < 0.16`. To fix this, you can run
this will currently depend on both version `0.15.6` and `0.16.1` of `ndarray` by default
even though `0.15.6` is within the range `>= 0.15, < 0.17`. To fix this, you can run

```sh
cargo update --package ndarray:0.15.3 --precise 0.13.1
cargo update --package ndarray:0.16.1 --precise 0.15.6
```

to achieve a single dependency on version `0.13.1` of `ndarray`.
to achieve a single dependency on version `0.15.6` of `ndarray`.

## Contributing

Expand Down
Loading