From 48705dfe00a73818546cfb9a8a12fcb4179dbcb9 Mon Sep 17 00:00:00 2001
From: shankari <shankari@eecs.berkeley.edu>
Date: Sun, 24 Jan 2021 17:36:35 -0800
Subject: [PATCH] Fix notebook dependencies by adding matplotlib (#789)

We didn't have matplotlib in the notebook dependencies!
Which is pretty surprising wrt plotting

Also include a fixed version of jedi to allow autocomplete to work
https://github.com/ipython/ipython/issues/12740
Should remove once fix is in place

Also remove unused notebook and notebook.exported files
notebook.exported since it is too OSX specific
notebook, because it has bitrotted compared to the main environment already

The additions is the way to keep things up to date since it avoids duplication (DRY principle)
---
 setup/environment36.notebook.additions.yml |   2 +
 setup/environment36.notebook.exported.yml  | 118 ---------------------
 setup/environment36.notebook.yml           |  35 ------
 3 files changed, 2 insertions(+), 153 deletions(-)
 delete mode 100644 setup/environment36.notebook.exported.yml
 delete mode 100644 setup/environment36.notebook.yml

diff --git a/setup/environment36.notebook.additions.yml b/setup/environment36.notebook.additions.yml
index 0ea46c088..85711f111 100644
--- a/setup/environment36.notebook.additions.yml
+++ b/setup/environment36.notebook.additions.yml
@@ -6,4 +6,6 @@ dependencies:
 - branca=0.4.1
 - folium=0.11.0
 - ipython=7.17.0
+- jedi=0.17.2
 - jupyter=1.0.0
+- matplotlib=3.2.2
diff --git a/setup/environment36.notebook.exported.yml b/setup/environment36.notebook.exported.yml
deleted file mode 100644
index 56ba48e75..000000000
--- a/setup/environment36.notebook.exported.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-name: emission-new
-channels:
-- conda-forge
-- defaults
-dependencies:
-- altair=2.3.0=py36_1001
-- appnope=0.1.0=py36_1000
-- arrow=0.12.1=py36_1002
-- attrdict=2.0.0=py_1
-- attrs=18.2.0=py_0
-- bleach=3.1.0=py_0
-- branca=0.2.0=py_1
-- ca-certificates=2018.11.29=ha4d7672_0
-- cachetools=2.1.0=py_0
-- certifi=2018.11.29=py36_1000
-- cheroot=6.2.4=py36_0
-- decorator=4.3.2=py_0
-- entrypoints=0.3=py36_1000
-- folium=0.5.0=py_0
-- future=0.16.0=py36_1002
-- geojson=2.3.0=py_0
-- google-auth=1.2.1=py_0
-- icu=58.2=h0a44026_1000
-- ipykernel=5.1.0=py36h24bf2e0_1002
-- ipython=5.3.0=py36_0
-- ipython_genutils=0.2.0=py_1
-- ipywidgets=7.4.2=py_0
-- jinja2=2.10=py_1
-- jpeg=9c=h1de35cc_1001
-- jsonpickle=0.9.6=py_1
-- jsonschema=3.0.0a3=py36_1000
-- jupyter_client=5.2.4=py_1
-- jupyter_console=5.2.0=py36_1
-- jupyter_core=4.4.0=py_0
-- libcxx=7.0.0=h2d50403_2
-- libpng=1.6.36=ha441bb4_1000
-- libsodium=1.0.16=h1de35cc_1001
-- llvm-meta=7.0.0=0
-- markupsafe=1.1.0=py36h1de35cc_1000
-- mistune=0.8.4=py36h1de35cc_1000
-- more-itertools=4.3.0=py36_1000
-- nbconvert=5.3.1=py_1
-- nbformat=4.4.0=py_1
-- ncurses=5.9=10
-- notebook=5.7.4=py36_1000
-- openssl=1.0.2p=h1de35cc_1002
-- pandas=0.20.1=np112py36_0
-- pandoc=2.6=1
-- pandocfilters=1.4.2=py_1
-- pexpect=4.6.0=py36_1000
-- pickleshare=0.7.5=py36_1000
-- pip=9.0.1=py36_1
-- prometheus_client=0.5.0=py_0
-- prompt_toolkit=1.0.15=py_1
-- ptyprocess=0.6.0=py36_1000
-- pyasn1=0.4.4=py_1
-- pyasn1-modules=0.2.3=py_0
-- pygments=2.3.1=py_0
-- pyqt=5.6.0=py36hc26a216_1008
-- pyrsistent=0.14.10=py36h1de35cc_0
-- python=3.6.1=2
-- python-dateutil=2.6.0=py36_0
-- pytz=2017.2=py36_0
-- pyzmq=17.1.2=py36h111632d_1001
-- qt=5.6.2=h9e3eb04_4
-- qtconsole=4.4.3=py_0
-- readline=6.2=0
-- rsa=3.4.2=py_1
-- send2trash=1.5.0=py_0
-- setuptools=40.8.0=py36_0
-- simplegeneric=0.8.1=py_1
-- sip=4.18.1=py36h0a44026_1000
-- six=1.12.0=py36_1000
-- sqlite=3.13.0=1
-- terminado=0.8.1=py36_1001
-- testpath=0.4.2=py36_1000
-- tk=8.5.19=2
-- toolz=0.9.0=py_1
-- tornado=5.1.1=py36h1de35cc_1000
-- traitlets=4.3.2=py36_1000
-- utm=0.4.2=py36_0
-- vincent=0.4.4=py_1
-- wcwidth=0.1.7=py_1
-- webencodings=0.5.1=py_1
-- wheel=0.33.0=py36_0
-- widgetsnbextension=3.4.2=py36_1000
-- xmltodict=0.11.0=py_1
-- xz=5.2.4=h1de35cc_1001
-- zeromq=4.2.5=h0a44026_1006
-- zlib=1.2.11=h1de35cc_1004
-- blas=1.0=mkl
-- intel-openmp=2019.1=144
-- jupyter=1.0.0=py36_3
-- mkl=2017.0.4=h1fae6ae_0
-- numpy=1.12.1=py36_0
-- requests=2.14.2=py36_0
-- scikit-learn=0.18.1=np112py36_1
-- scipy=0.19.0=np112py36_0
-- pip:
-  - asn1crypto==0.24.0
-  - cffi==1.11.5
-  - cryptography==2.5
-  - ipython-genutils==0.2.0
-  - jupyter-client==5.2.4
-  - jupyter-console==5.2.0
-  - jupyter-core==4.4.0
-  - jwcrypto==0.4.2
-  - lxml==4.3.1
-  - prometheus-client==0.5.0
-  - prompt-toolkit==1.0.15
-  - pycparser==2.19
-  - pyfcm==1.4.3
-  - pygeocoder==1.2.5
-  - pykml==0.1.3
-  - pymongo==3.5.1
-  - requests-toolbelt==0.9.1
-prefix: /Users/shankari/OSS/anaconda/envs/emission-new
-
diff --git a/setup/environment36.notebook.yml b/setup/environment36.notebook.yml
deleted file mode 100644
index 9bfa55f57..000000000
--- a/setup/environment36.notebook.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: emission
-channels:
-- conda-forge
-- defaults
-dependencies:
-- branca=0.2.0=py_1
-- folium=0.5.0=py_0
-- ipython=5.3.0=py36_0
-- jupyter=1.0.0=py36_3
-- arrow=0.12.1
-- attrdict=2.0.0
-- cheroot=6.2.*=py36_0
-- future=0.16.0
-- geojson=2.3.0
-- google-auth=1.2.1
-- jsonpickle=0.9.6
-- numpy=1.12.1=py36_0
-- pandas=0.20.1=np112py36_0
-- pip=9.0.1=py36_1
-- python=3.6.1=2
-- python-dateutil=2.6.0=py36_0
-- pytz=2017.2=py36_0
-- requests=2.14.2=py36_0
-- scikit-learn=0.18.1=np112py36_1
-- scipy=0.19.0=np112py36_0
-- sqlite=3.13.0
-- utm=0.4.2
-- xmltodict=0.11.0
-- pip:
-  - jwcrypto==0.4.2
-  - pyfcm==1.4.3
-  - pygeocoder==1.2.5
-  - pykml==0.1.3
-  - pymongo==3.5.1
-prefix: /Users/shankari/OSS/anaconda/envs/emission