From ce14d4695166e144a00d8cbfafbc554a2e2b4878 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Mon, 4 Feb 2019 13:19:26 -0800 Subject: [PATCH 1/4] mkl should be shipped by default in conda --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index ded37a6..b218efc 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,6 @@ dependencies: - scipy - matplotlib - ipywidgets>=0.6.0 - - mkl - pip: - pymatsolver - discretize From 5cb2dd231eb4bf100d99abbc7cdfd058b75e48ac Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Sat, 6 Jul 2019 09:33:45 -0700 Subject: [PATCH 2/4] pin SimPEG specific requirements --- environment.yml | 6 +++--- requirements.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/environment.yml b/environment.yml index b218efc..55fd8bb 100644 --- a/environment.yml +++ b/environment.yml @@ -9,6 +9,6 @@ dependencies: - matplotlib - ipywidgets>=0.6.0 - pip: - - pymatsolver - - discretize - - SimPEG + - pymatsolver==0.1.2 + - discretize==0.3.8 + - SimPEG==0.10.4 diff --git a/requirements.txt b/requirements.txt index 8461352..6f60a78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,6 @@ numpy scipy matplotlib ipywidgets -discretize -SimPEG -pymatsolver +pymatsolver==0.1.2 +discretize==0.3.8 +SimPEG==0.10.4 From eee619bcb5042d041297afacb48bb109e10fa71b Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Sat, 6 Jul 2019 09:43:01 -0700 Subject: [PATCH 3/4] add geoana to the pinned requirements --- environment.yml | 1 + requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index 55fd8bb..8d996e1 100644 --- a/environment.yml +++ b/environment.yml @@ -9,6 +9,7 @@ dependencies: - matplotlib - ipywidgets>=0.6.0 - pip: + - geoana==0.0.5 - pymatsolver==0.1.2 - discretize==0.3.8 - SimPEG==0.10.4 diff --git a/requirements.txt b/requirements.txt index 6f60a78..21b0441 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,7 @@ numpy scipy matplotlib ipywidgets +geoana==0.0.5 pymatsolver==0.1.2 discretize==0.3.8 SimPEG==0.10.4 From c2645faf85ba4d92d4f95461f016e8c785688b0d Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Sat, 6 Jul 2019 15:02:18 -0700 Subject: [PATCH 4/4] Update environment.yml --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 8d996e1..8a78adb 100644 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,7 @@ dependencies: - scipy - matplotlib - ipywidgets>=0.6.0 + - mkl - pip: - geoana==0.0.5 - pymatsolver==0.1.2