Skip to content

Commit 2c892ec

Browse files
committed
Merge branch 'features/nc' into dev
2 parents 2692840 + d50a566 commit 2c892ec

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
Cargo.lock
55
.idea
66
.idea/*
7+
true/
78
*.csv
89
*.m
910
*.pickle

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ travis-ci = { repository = "axect/peroxide" }
1717
maintenance = { status = "actively-developed" }
1818

1919
[dev-dependencies]
20-
float-cmp = "0.8"
20+
float-cmp = "0.9"
2121

2222
[dependencies]
2323
csv = { version = "1.1", optional = true, default_features = false }
2424
rand = "0.8"
2525
rand_distr = "0.4"
2626
order-stat = "0.1"
2727
puruspe = "0.1"
28-
matrixmultiply = { version = "0.3", features = ["threading"] }
28+
matrixmultiply = { version = "0.3", features = ["threading"] }
2929
peroxide-ad = "0.3"
3030
#num-complex = "0.3"
31-
netcdf = { version = "0.6", optional = true, default_features = false }
32-
pyo3 = { version = "0.13", optional = true }
31+
netcdf = { version = "0.7", optional = true, default_features = false }
32+
pyo3 = { version = "0.15", optional = true }
3333
blas = { version = "0.22", optional = true }
3434
lapack = { version = "0.19", optional = true }
3535
serde = { version = "1.0", features = ["derive"], optional = true }

0 commit comments

Comments
 (0)