From 54278402a1805cc63eb4ac630e97c7056fe978cc Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Thu, 27 Jul 2017 13:46:12 -0400 Subject: [PATCH 01/12] Add bokeh --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index f8f3ffc..14c46ed 100644 --- a/environment.yml +++ b/environment.yml @@ -8,5 +8,6 @@ dependencies: - dill - pandas - partd + - bokeh - pip: - git+https://github.com/blaze/dask.git#egg=dask[complete] From bbb40e50fe7bc03010182b502a72531f89cf4aea Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:00:17 -0700 Subject: [PATCH 02/12] Add channels --- environment.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/environment.yml b/environment.yml index 14c46ed..4541177 100644 --- a/environment.yml +++ b/environment.yml @@ -1,5 +1,9 @@ name: example-environment +channels: + - defaults + - conda-forge + dependencies: - python=3.6 - numpy From 1059e58fb150772a100d768b599ff396bda15438 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:04:07 -0700 Subject: [PATCH 03/12] Remove defaults channel --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 4541177..53b926b 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,6 @@ name: example-environment channels: - - defaults - conda-forge dependencies: From 8a4d31eda40e076a50207b3b224e62d3f171392c Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:07:40 -0700 Subject: [PATCH 04/12] Pin to 3.4.0 --- environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 53b926b..2a097bc 100644 --- a/environment.yml +++ b/environment.yml @@ -1,10 +1,11 @@ name: example-environment channels: + - defaults - conda-forge dependencies: - - python=3.6 + - python=3.4.0 - numpy - toolz - matplotlib From 1f004842b9a406a666e10dc10fa0d69b5d2be979 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:11:28 -0700 Subject: [PATCH 05/12] Remove defaults --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 2a097bc..086dda7 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,6 @@ name: example-environment channels: - - defaults - conda-forge dependencies: From 41db7a162afac6cae0fba1b9fa64aa34112e8ebd Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:33:07 -0700 Subject: [PATCH 06/12] make python3 --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 086dda7..bf77a2f 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - - python=3.4.0 + - python3 - numpy - toolz - matplotlib From b95e3a641133aec9a16d973685daeb970e092a86 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:40:00 -0700 Subject: [PATCH 07/12] No python --- environment.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index bf77a2f..aede622 100644 --- a/environment.yml +++ b/environment.yml @@ -1,10 +1,8 @@ name: example-environment - channels: + - defaults - conda-forge - dependencies: - - python3 - numpy - toolz - matplotlib From 7aed0acaae4fb68882f6aca3ca2ed7ea3afcf531 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:57:46 -0700 Subject: [PATCH 08/12] Add psutils. Add back python --- environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index aede622..8af9106 100644 --- a/environment.yml +++ b/environment.yml @@ -3,8 +3,10 @@ channels: - defaults - conda-forge dependencies: + - python - numpy - toolz + - psutils - matplotlib - dill - pandas From 1a2bfef65f70d1b2e831ebec6264b8c98e2993e8 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 17:59:46 -0700 Subject: [PATCH 09/12] Remove defaults channel --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 8af9106..6e7d594 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,5 @@ name: example-environment channels: - - defaults - conda-forge dependencies: - python From a98ea60cd3dacad4f5fd2d0caa80a650e18a3242 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 24 Jul 2017 18:01:21 -0700 Subject: [PATCH 10/12] Remove psutils --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 6e7d594..2cf99a9 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,6 @@ dependencies: - python - numpy - toolz - - psutils - matplotlib - dill - pandas From aed25435ca24b70a1493f6621cbd97b7feb86600 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Thu, 27 Jul 2017 10:47:36 -0400 Subject: [PATCH 11/12] Require psutil --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 2cf99a9..3d3e9c9 100644 --- a/environment.yml +++ b/environment.yml @@ -4,6 +4,7 @@ channels: dependencies: - python - numpy + - psutil - toolz - matplotlib - dill From 8be3642d1e9518b696288851bfef2e59dc33860c Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Thu, 27 Jul 2017 10:58:19 -0400 Subject: [PATCH 12/12] Require a stable install of dask --- environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 3d3e9c9..7e4955c 100644 --- a/environment.yml +++ b/environment.yml @@ -11,5 +11,4 @@ dependencies: - pandas - partd - bokeh - - pip: - - git+https://github.com/blaze/dask.git#egg=dask[complete] + - dask