Skip to content

Commit

Permalink
Merge pull request #637 from shankari/trim_python_modules
Browse files Browse the repository at this point in the history
Vastly simplify the set of dependencies for the main e-mission server
  • Loading branch information
shankari committed Feb 12, 2019
2 parents f562179 + 07f4dc9 commit a163ee6
Show file tree
Hide file tree
Showing 21 changed files with 336 additions and 272 deletions.
2 changes: 1 addition & 1 deletion emission/net/usercache/builtin_usercache_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import emission.net.usercache.formatters.formatter as enuf
import emission.storage.pipeline_queries as esp
import emission.storage.decorations.tour_model_queries as esdtmpq
# import emission.storage.decorations.tour_model_queries as esdtmpq

import emission.core.wrapper.trip as ecwt
import emission.core.wrapper.entry as ecwe
Expand Down
70 changes: 0 additions & 70 deletions setup/environment27.yml

This file was deleted.

57 changes: 57 additions & 0 deletions setup/environment36.exported.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: minimal_emission
channels:
- conda-forge
- defaults
dependencies:
- arrow=0.12.1=py36_1002
- attrdict=2.0.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
- future=0.16.0=py36_1002
- geojson=2.3.0=py_0
- google-auth=1.2.1=py_0
- jsonpickle=0.9.6=py_1
- more-itertools=4.3.0=py36_1000
- ncurses=5.9=10
- openssl=1.0.2p=h1de35cc_1002
- pandas=0.20.1=np112py36_0
- pip=9.0.1=py36_1
- pyasn1=0.4.4=py_1
- pyasn1-modules=0.2.3=py_0
- python=3.6.1=2
- python-dateutil=2.6.0=py36_0
- pytz=2017.2=py36_0
- readline=6.2=0
- rsa=3.4.2=py_1
- setuptools=40.8.0=py36_0
- six=1.12.0=py36_1000
- sqlite=3.13.0=1
- tk=8.5.19=2
- utm=0.4.2=py36_0
- wheel=0.33.0=py36_0
- xmltodict=0.11.0=py_1
- xz=5.2.4=h1de35cc_1001
- zlib=1.2.11=h1de35cc_1004
- blas=1.0=mkl
- intel-openmp=2019.1=144
- 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
- jwcrypto==0.4.2
- lxml==4.3.1
- 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/minimal_emission

58 changes: 58 additions & 0 deletions setup/environment36.nomkl.exported.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: minimal_emission_nomkl
channels:
- conda-forge
- defaults
dependencies:
- arrow=0.12.1=py36_1002
- attrdict=2.0.0=py_1
- blas=1.1=openblas
- 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
- future=0.16.0=py36_1002
- geojson=2.3.0=py_0
- google-auth=1.2.1=py_0
- jsonpickle=0.9.6=py_1
- more-itertools=4.3.0=py36_1000
- ncurses=5.9=10
- numpy=1.12.1=py36_blas_openblas_200
- openblas=0.2.19=2
- openssl=1.0.2p=h1de35cc_1002
- pandas=0.20.1=np112py36_0
- pip=9.0.1=py36_1
- pyasn1=0.4.4=py_1
- pyasn1-modules=0.2.3=py_0
- python=3.6.1=2
- python-dateutil=2.6.0=py36_0
- pytz=2017.2=py36_0
- readline=6.2=0
- rsa=3.4.2=py_1
- scikit-learn=0.18.1=np112py36_blas_openblas_200
- scipy=0.19.0=np112py36_blas_openblas_202
- setuptools=40.8.0=py36_0
- six=1.12.0=py36_1000
- sqlite=3.13.0=1
- tk=8.5.19=2
- utm=0.4.2=py36_0
- wheel=0.33.0=py36_0
- xmltodict=0.11.0=py_1
- xz=5.2.4=h1de35cc_1001
- zlib=1.2.11=h1de35cc_1004
- libgfortran=3.0.1=h93005f0_2
- nomkl=3.0=0
- requests=2.14.2=py36_0
- pip:
- asn1crypto==0.24.0
- cffi==1.11.5
- cryptography==2.5
- jwcrypto==0.4.2
- lxml==4.3.1
- 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/minimal_emission_nomkl

32 changes: 32 additions & 0 deletions setup/environment36.nomkl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: emission
channels:
- conda-forge
- defaults
dependencies:
- 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
- nomkl
- numpy=1.12.1
- pandas=0.20.1
- 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
- scipy=0.19.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
9 changes: 9 additions & 0 deletions setup/environment36.notebook.additions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
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
118 changes: 118 additions & 0 deletions setup/environment36.notebook.exported.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
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

35 changes: 35 additions & 0 deletions setup/environment36.notebook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
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
Loading

0 comments on commit a163ee6

Please sign in to comment.