From d7f57067b26981d8b0443df5fdc37dcb5967bbe1 Mon Sep 17 00:00:00 2001 From: Alistair Miles Date: Mon, 4 Feb 2019 11:35:50 +0100 Subject: [PATCH 1/3] Upgrade msprime to 0.6.2 --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 5cec80c..cc4b6d4 100644 --- a/environment.yml +++ b/environment.yml @@ -51,7 +51,7 @@ dependencies: - matplotlib=3.0.2 - matplotlib-venn=0.11.5 - msgpack-python=0.6.0 - - msprime=0.6.1 + - msprime=0.6.2 - mysqlclient=1.3.14 - nb_conda_kernels=2.2.0 - nbconvert=5.4.0 From ec9671c78a9f341e36c902f65cf8bec09578d6b2 Mon Sep 17 00:00:00 2001 From: Nick Harding Date: Mon, 4 Feb 2019 11:12:46 +0000 Subject: [PATCH 2/3] Specify build of msprime There is currently some conflict between msprime and openblas. I think this will work, but will drop openblas to 0.3.3 --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index cc4b6d4..dcb7f77 100644 --- a/environment.yml +++ b/environment.yml @@ -51,7 +51,7 @@ dependencies: - matplotlib=3.0.2 - matplotlib-venn=0.11.5 - msgpack-python=0.6.0 - - msprime=0.6.2 + - msprime=0.6.2=py36hf3f1cc3_3 - mysqlclient=1.3.14 - nb_conda_kernels=2.2.0 - nbconvert=5.4.0 From 80645b67e1ef0a89226152b2d9caaf6a640a121c Mon Sep 17 00:00:00 2001 From: Nick Harding Date: Mon, 4 Feb 2019 16:46:33 +0000 Subject: [PATCH 3/3] back to 0.6.2 without build number --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index dcb7f77..cc4b6d4 100644 --- a/environment.yml +++ b/environment.yml @@ -51,7 +51,7 @@ dependencies: - matplotlib=3.0.2 - matplotlib-venn=0.11.5 - msgpack-python=0.6.0 - - msprime=0.6.2=py36hf3f1cc3_3 + - msprime=0.6.2 - mysqlclient=1.3.14 - nb_conda_kernels=2.2.0 - nbconvert=5.4.0