Skip to content

Commit

Permalink
Merge pull request #156 from magnusuMET/feature/ndarray_0.16
Browse files Browse the repository at this point in the history
Bump ndarray
  • Loading branch information
magnusuMET authored Aug 12, 2024
2 parents 2610246 + 2000912 commit 1ffc2ec
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Update apt
run: sudo apt-get update

- name: Install netcdf
run: sudo apt-get install libnetcdf-dev

Expand Down
2 changes: 1 addition & 1 deletion netcdf-examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ mpi = ["dep:mpi", "netcdf/mpi", "dep:mpi-sys"]
netcdf = { workspace = true }
mpi = { version = "0.7.0", optional = true }
mpi-sys = { workspace = true, optional = true }
ndarray = "0.15.6"
ndarray = ">=0.15,<=0.16"
2 changes: 1 addition & 1 deletion netcdf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ mpi = ["dep:mpi-sys", "netcdf-sys/mpi"]
ndarray = ["dep:ndarray"]

[dependencies]
ndarray = { version = "0.15", optional = true }
ndarray = { version = ">=0.15,<=0.16", optional = true }
netcdf-sys = { workspace = true }
netcdf-derive = { workspace = true, optional = true }
bitflags = "2.4.2"
Expand Down
5 changes: 1 addition & 4 deletions netcdf/src/par.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use crate::{
error::{checked, Result},
utils::checked_with_lock,
};
use crate::{error::Result, utils::checked_with_lock};

use netcdf_sys::nc_type;

Expand Down

0 comments on commit 1ffc2ec

Please sign in to comment.