Branch: refs/heads/dev 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: dc801dc1f6097b283e01c784d09261b3c4ee21e5 https://github.com/galaxyproject/galaxy/commit/dc801dc1f6097b283e01c784d0926... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: A doc/source/admin/framework_dependencies.rst M doc/source/admin/index.rst Log Message: ----------- Add admin documentation for framework dependencies (wheels) for the 16.01 release. 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: 9827f32775b34a566c887963103a1f921e2b7a95 https://github.com/galaxyproject/galaxy/commit/9827f32775b34a566c887963103a1... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M doc/source/admin/framework_dependencies.rst Log Message: ----------- conda-requirements.txt renamed to conda-environment.txt 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` Commit: 168f453094d546cd1552a1a179decc4914c1d93a https://github.com/galaxyproject/galaxy/commit/168f453094d546cd1552a1a179dec... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M doc/source/admin/framework_dependencies.rst Log Message: ----------- Suggest installing virtualenv from brew Commit: 954aff7fa806ee77682476ac56ec95027482bb0c https://github.com/galaxyproject/galaxy/commit/954aff7fa806ee77682476ac56ec9... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: A doc/source/admin/framework_dependencies.rst M doc/source/admin/index.rst Log Message: ----------- Merge pull request #1589 from natefoo/admin-docs [16.01] Add admin documentation for framework dependencies (wheels) Commit: 30dcd0e39f0ae5d2eb7671bbfaf212c0c5a77eff https://github.com/galaxyproject/galaxy/commit/30dcd0e39f0ae5d2eb7671bbfaf21... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-01-27 (Wed, 27 Jan 2016) Changed paths: A doc/source/admin/framework_dependencies.rst M doc/source/admin/index.rst A lib/galaxy/dependencies/conda-environment.txt Log Message: ----------- Merge branch 'release_16.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/f725e964333d...30dcd0e39f0a