Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: c8b0057349be9a683e295c073f66163f47c257e7 https://github.com/galaxyproject/galaxy/commit/c8b0057349be9a683e295c073f661... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-21 (Thu, 21 Jan 2016) Changed paths: A lib/galaxy/dependencies/conda-requirements.txt Log Message: ----------- Add a requirements file suitable for use with `conda {create,install} --file`. Commit: 1486af0ef90a186b5648f737af32e84640263857 https://github.com/galaxyproject/galaxy/commit/1486af0ef90a186b5648f737af32e... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: A lib/galaxy/dependencies/conda-environment.txt R lib/galaxy/dependencies/conda-requirements.txt Log Message: ----------- Rename conda-requirements.txt to conda-environment.txt since it is not a requirements file, include instructions on how to install remaining dependencies from pip. Commit: c2d94c43bbd5929d4773e859dc1f5d8e436b0ee8 https://github.com/galaxyproject/galaxy/commit/c2d94c43bbd5929d4773e859dc1f5... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: A lib/galaxy/dependencies/conda-environment.txt Log Message: ----------- Merge pull request #1560 from natefoo/conda-interop [16.01] Add a requirements file suitable for use with `conda {create,install} --file` Compare: https://github.com/galaxyproject/galaxy/compare/35f90da20ca2...c2d94c43bbd5