Skip to content

Commit

Permalink
clean up environment.yml (#932)
Browse files Browse the repository at this point in the history
* clean up environment.yml

- remove conda-forge from channel list and only apply it to packages that need it (to avoid upgrading all packages to bleeding-edge versions)
- remove ctapipe-extra from pip install, use conda instead

* also updated python-version-specific yaml files
  • Loading branch information
kosack authored Jan 25, 2019
1 parent 72f2bb5 commit 1322e2f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
10 changes: 5 additions & 5 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# A conda environment with all useful package for ctapipe developers
name: cta-dev
channels:
- default
- cta-observatory
- conda-forge
dependencies:
- ctapipe-extra=0.2.16
- zeromq
- pyzmq>=17 # needed for correct function of notebooks on OSX
- astropy
- bokeh
- cython
- gammapy
- conda-forge::gammapy
- graphviz
- h5py
- iminuit
Expand All @@ -21,14 +22,13 @@ dependencies:
- numpy>=1.15.4
- numpydoc
- pandas
- pyhessio
- pytest
- pytest-cov
- psutil
- scikit-learn
- scipy
- setuptools
- sphinx=1.7
- sphinx
- sphinx_rtd_theme
- sphinx-automodapi
- traitlets
Expand All @@ -42,4 +42,4 @@ dependencies:
- pip:
- pytest_runner
- eventio==0.11.0
- https://github.com/cta-observatory/ctapipe-extra/archive/v0.2.16.tar.gz

7 changes: 3 additions & 4 deletions py3.6_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: cta-dev
channels:
- default
- cta-observatory
- conda-forge
dependencies:
- ctapipe-extra=0.2.16
- python=3.6 # nail the python version, so conda does not try upgrading / dowgrading
- zeromq
- pyzmq>=17 # needed for correct function of notebooks on OSX
- astropy
- bokeh
- cython
- gammapy
- conda-forge::gammapy
- graphviz
- h5py
- iminuit
Expand All @@ -28,7 +28,7 @@ dependencies:
- scikit-learn
- scipy
- setuptools
- sphinx=1.7
- sphinx
- sphinx_rtd_theme
- sphinx-automodapi
- traitlets
Expand All @@ -42,5 +42,4 @@ dependencies:
- pip:
- pytest_runner
- eventio==0.11.0
- https://github.com/cta-observatory/ctapipe-extra/archive/v0.2.16.tar.gz
- https://github.com/cta-observatory/pyhessio/archive/v2.1.1.tar.gz
7 changes: 3 additions & 4 deletions py3.7_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: cta-dev
channels:
- default
- cta-observatory
- conda-forge
dependencies:
- ctapipe-extra=0.2.16
- python=3.7
- zeromq
- pyzmq>=17 # needed for correct function of notebooks on OSX
- astropy
- bokeh
- cython
- gammapy
- conda-forge::gammapy
- graphviz
- h5py
- iminuit
Expand All @@ -28,7 +28,7 @@ dependencies:
- scikit-learn
- scipy
- setuptools
- sphinx=1.7
- sphinx
- sphinx_rtd_theme
- sphinx-automodapi
- traitlets
Expand All @@ -42,5 +42,4 @@ dependencies:
- pip:
- pytest_runner
- eventio==0.11.0
- https://github.com/cta-observatory/ctapipe-extra/archive/v0.2.16.tar.gz
- https://github.com/cta-observatory/pyhessio/archive/v2.1.1.tar.gz

0 comments on commit 1322e2f

Please sign in to comment.