From 8d98eda3080aec978668132b0b31c93a49aa1695 Mon Sep 17 00:00:00 2001
From: Chris Leaman <ckleaman@gmail.com>
Date: Tue, 18 Dec 2018 13:43:57 +1100
Subject: [PATCH] Simplify environment

---
 Makefile        |   8 +-
 environment.yml | 192 +++++++++---------------------------------------
 2 files changed, 36 insertions(+), 164 deletions(-)

diff --git a/Makefile b/Makefile
index 1196d12..08fc6ad 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ CURRENT_DIR = $(shell pwd)
 
 .PHONY: venv-init
 venv-init: ##@environment Setup virtual environment
-	conda env create -f environment.yml --prefix=.venv python=3.6
+	conda env create -f environment.yml --prefix=.venv
 
 .PHONY: venv-activate
 venv-activate: ##@environment Activates the virtual environment
@@ -27,12 +27,6 @@ venv-update: ##@environment Updates to latest packages
 venv-requirements-install: ##@environment Ensures environment.yml packages are installed
 	conda env update
 
-# The environment.yml file should really be created by hand, but
-# this provides a good starting point.
-.PHONY: venv-requirements-export
-venv-requirements-export: ##@environment Exports current environment to environment.yml
-	conda env export --file environment.yml
-
 # To install new packages: conda install --prefix .venv PACKAGE
 
 
diff --git a/environment.yml b/environment.yml
index 340d23e..edfc2de 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,161 +1,39 @@
-name: C:\Users\z5189959\Desktop\nsw-2016-storm-impact\.venv
 channels:
-  - plotly
-  - defaults
   - conda-forge
+  - plotly
 dependencies:
-  - black=18.9b0=py_0
-  - colorlover=0.2.1=py_0
-  - jupyter_contrib_core=0.3.3=py_2
-  - jupyter_contrib_nbextensions=0.5.0=py36_1000
-  - jupyter_highlight_selected_word=0.2.0=py36_1000
-  - jupyter_latex_envs=1.4.4=py36_1000
-  - jupyter_nbextensions_configurator=0.4.0=py36_1000
-  - matplotlib-base=3.0.2=py36h3e3dc42_1001
-  - appdirs=1.4.3=py36h28b3542_0
-  - asn1crypto=0.24.0=py36_0
-  - attrs=18.2.0=py36h28b3542_0
-  - autopep8=1.4.3=py36_0
-  - backcall=0.1.0=py36_0
-  - blas=1.0=mkl
-  - bleach=3.0.2=py36_0
-  - boost=1.67.0=py36_4
-  - boost-cpp=1.67.0=hfa6e2cd_4
-  - ca-certificates=2018.03.07=0
-  - certifi=2018.10.15=py36_0
-  - cffi=1.11.5=py36h74b6da3_1
-  - chardet=3.0.4=py36_1
-  - click=7.0=py36_0
-  - click-plugins=1.0.4=py36_0
-  - cligj=0.5.0=py36_0
-  - colorama=0.4.0=py36_0
-  - cryptography=2.3.1=py36h74b6da3_0
-  - curl=7.62.0=h2a8f88b_0
-  - cycler=0.10.0=py36h009560c_0
-  - decorator=4.3.0=py36_0
-  - entrypoints=0.2.3=py36_2
-  - expat=2.2.5=he025d50_0
-  - fiona=1.7.10=py36h5bf8d1d_0
-  - freetype=2.9.1=ha9979f8_1
-  - freexl=1.0.5=hfa6e2cd_0
-  - gdal=2.2.2=py36hcebd033_1
-  - geos=3.6.2=h9ef7328_2
-  - geotiff=1.4.2=hd5bfa41_0
-  - hdf4=4.2.13=h712560f_2
-  - hdf5=1.10.1=h98b8871_1
-  - icc_rt=2017.0.4=h97af966_0
-  - icu=58.2=ha66f8fd_1
-  - idna=2.7=py36_0
-  - intel-openmp=2019.1=144
-  - ipykernel=5.1.0=py36h39e3cac_0
-  - ipython=7.2.0=py36h39e3cac_0
-  - ipython_genutils=0.2.0=py36h3c5d0ee_0
-  - ipywidgets=7.4.2=py36_0
-  - jedi=0.13.1=py36_0
-  - jinja2=2.10=py36_0
-  - jpeg=9b=hb83a4c4_2
-  - jsonschema=2.6.0=py36h7636477_0
-  - jupyter_client=5.2.3=py36_0
-  - jupyter_core=4.4.0=py36_0
-  - kealib=1.4.7=ha5b336b_5
-  - kiwisolver=1.0.1=py36h6538335_0
-  - krb5=1.16.1=h038dc86_6
-  - libboost=1.67.0=hfd51bdf_4
-  - libcurl=7.62.0=h2a8f88b_0
-  - libgdal=2.2.2=h2727f2b_1
-  - libiconv=1.15=h1df5818_7
-  - libkml=1.3.0=he5f2a48_4
-  - libnetcdf=4.4.1.1=h825a56a_8
-  - libpng=1.6.35=h2a8f88b_0
-  - libpq=10.5=h5fe2233_0
-  - libsodium=1.0.16=h9d3ae62_0
-  - libspatialite=4.3.0a=h383548d_18
-  - libssh2=1.8.0=hd619d38_4
-  - libtiff=4.0.9=h36446d0_2
-  - libxml2=2.9.8=hadb2253_1
-  - libxslt=1.1.32=hf6f1972_0
-  - lxml=4.2.5=py36hef2cd61_0
-  - m2w64-gcc-libgfortran=5.3.0=6
-  - m2w64-gcc-libs=5.3.0=7
-  - m2w64-gcc-libs-core=5.3.0=7
-  - m2w64-gmp=6.1.0=2
-  - m2w64-libwinpthread-git=5.0.0.4634.697f757=2
-  - markupsafe=1.1.0=py36he774522_0
-  - matplotlib=3.0.1=py36hc8f65d3_0
-  - mistune=0.8.4=py36he774522_0
-  - mkl=2018.0.3=1
-  - mkl_fft=1.0.6=py36hdbbee80_0
-  - mkl_random=1.0.1=py36h77b88f5_1
-  - msys2-conda-epoch=20160418=1
-  - munch=2.3.2=py36_0
-  - nbconvert=5.3.1=py36_0
-  - nbformat=4.4.0=py36h3a5bc1b_0
-  - notebook=5.7.2=py36_0
-  - numpy=1.15.4=py36ha559c80_0
-  - numpy-base=1.15.4=py36h8128ebf_0
-  - openjpeg=2.3.0=h5ec785f_1
-  - openssl=1.0.2p=hfa6e2cd_0
-  - pandas=0.23.4=py36h830ac7b_0
-  - pandoc=2.2.3.2=0
-  - pandocfilters=1.4.2=py36_1
-  - parso=0.3.1=py36_0
-  - pickleshare=0.7.5=py36_0
-  - pip=18.1=py36_0
-  - plotly=3.4.2=py36h28b3542_0
-  - proj4=4.9.3=hcf24537_7
-  - prometheus_client=0.4.2=py36_0
-  - prompt_toolkit=2.0.7=py36_0
-  - psutil=5.4.8=py36he774522_0
-  - py-boost=1.67.0=py36h8300f20_4
-  - pycodestyle=2.4.0=py36_0
-  - pycparser=2.19=py36_0
-  - pygments=2.2.0=py36hb010967_0
-  - pyopenssl=18.0.0=py36_0
-  - pyparsing=2.3.0=py36_0
-  - pyproj=1.9.5.1=py36_0
-  - pyqt=5.9.2=py36h6538335_2
-  - pysocks=1.6.8=py36_0
-  - python=3.6.7=h33f27b4_1
-  - python-dateutil=2.7.5=py36_0
-  - pytz=2018.7=py36_0
-  - pywinpty=0.5.4=py36_0
-  - pyyaml=3.13=py36hfa6e2cd_0
-  - pyzmq=17.1.2=py36hfa6e2cd_0
-  - qt=5.9.6=vc14h1e9a669_2
-  - requests=2.20.1=py36_0
-  - retrying=1.3.3=py36_2
-  - scikit-learn=0.20.1=py36hb854c30_0
-  - scipy=1.1.0=py36h4f6bf74_1
-  - send2trash=1.5.0=py36_0
-  - setuptools=40.6.2=py36_0
-  - shapely=1.6.4=py36hc90234e_0
-  - sip=4.19.8=py36h6538335_0
-  - six=1.11.0=py36_1
-  - sqlite=3.25.3=he774522_0
-  - terminado=0.8.1=py36_1
-  - testpath=0.4.2=py36_0
-  - tk=8.6.8=hfa6e2cd_0
-  - toml=0.10.0=py36h28b3542_0
-  - tornado=5.1.1=py36hfa6e2cd_0
-  - traitlets=4.3.2=py36h096827d_0
-  - urllib3=1.23=py36_0
-  - vc=14.1=h0510ff6_4
-  - vs2015_runtime=14.15.26706=h3a45250_0
-  - wcwidth=0.1.7=py36h3d5aa90_0
-  - webencodings=0.5.1=py36_1
-  - wheel=0.32.3=py36_0
-  - widgetsnbextension=3.4.2=py36_0
-  - win_inet_pton=1.0.1=py36_1
-  - wincertstore=0.2=py36h7fe50ca_0
-  - winpty=0.4.3=4
-  - xerces-c=3.2.2=ha925a31_0
-  - xz=5.2.4=h2fa13f4_4
-  - yaml=0.1.7=hc54c509_2
-  - yapf=0.25.0=py36_0
-  - zeromq=4.2.5=he025d50_1
-  - zlib=1.2.11=h62dcd97_3
-  - plotly-orca=1.1.1=1
+  - python=3.6
+  - attrs
+  - autopep8
+  - black
+  - click
+  - click-plugins
+  - colorlover
+  - fiona
+  - ipykernel
+  - ipython
+  - ipywidgets
+  - matplotlib
+  - nbformat
+  - notebook
+  - numpy
+  - pandas
+  - pandoc
+  - pip
+  - plotly
+  - plotly-orca
+  - proj4
+  - pyproj
+  - python-dateutil
+  - pytz
+  - pyyaml
+  - requests
+  - scikit-learn
+  - scipy
+  - setuptools
+  - shapely
+  - yaml
+  - yapf
   - pip:
-    - blackcellmagic==0.0.1
-    - mat4py==0.4.1
-prefix: C:\Users\z5189959\Desktop\nsw-2016-storm-impact\.venv
+    - blackcellmagic
+    - mat4py