diff --git a/fwdpy11/headers/fwdpp b/fwdpy11/headers/fwdpp index 960c7af4f..2a3a95175 160000 --- a/fwdpy11/headers/fwdpp +++ b/fwdpy11/headers/fwdpp @@ -1 +1 @@ -Subproject commit 960c7af4ff0e27c302178d040e8425153e6db0e5 +Subproject commit 2a3a95175f235cddadaa9028d8bdfdca1c94aac4 diff --git a/rust/fp11rust/Cargo.lock b/rust/fp11rust/Cargo.lock index 721e06a37..f23cd10cd 100644 --- a/rust/fp11rust/Cargo.lock +++ b/rust/fp11rust/Cargo.lock @@ -10,9 +10,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "demes" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4326ca7f794a2ee4aab90a230a9de5b2af53ffb5265a3131fea5a476242f0d14" +checksum = "21ac80782d22d8d728988ef57bb72e40e60404c86b6ef42ef6ca99e09242e755" dependencies = [ "regex", "serde", @@ -22,20 +22,19 @@ dependencies = [ [[package]] name = "demes-forward" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4490aee7308ba16246e9e42fbc6848d1f2501f66866fc98ed891f57274e5a33" +checksum = "95b22a06091ef181817da572747886b8c9132a70040cba031144c8fa36f290ab" dependencies = [ "demes", - "ndarray", "thiserror", ] [[package]] name = "demes-forward-capi" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c011c6a8e05588dad9f0aa2e105a3f282e297e795a96029311ffcd880d14f68d" +checksum = "fa684e8eb4377a4ef7cb318d8908e644ca99220c67a34cb14d591b2eb9c06aac" dependencies = [ "demes-forward", "libc", @@ -77,56 +76,6 @@ version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -[[package]] -name = "matrixmultiply" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" -dependencies = [ - "rawpointer", -] - -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "num-complex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - [[package]] name = "proc-macro2" version = "1.0.52" @@ -145,12 +94,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - [[package]] name = "regex" version = "1.7.1" diff --git a/tests/demes-spec b/tests/demes-spec index 44803a99f..402bbbca1 160000 --- a/tests/demes-spec +++ b/tests/demes-spec @@ -1 +1 @@ -Subproject commit 44803a99f28209560948acab1a6b4106ec2c0283 +Subproject commit 402bbbca16ba9d0da520ab6b17089dc804708aae