Commit Graph
60 Commits
Author SHA1 Message Date
Evgeny Anatskiy 5f9154a617 tiny fixes 2016-10-12 13:00:24 +02:00
Björn Grüning 2cc133f325 Add initial docs 2016-10-09 21:32:08 +02:00
Nicola Soranzo a2ee8d10af Merge branch 'release_16.07' into dev
Conflicts:
	doc/source/admin/conda_faq.rst
	static/maps/mvc/ui/ui-modal.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/ui/ui-modal.js
2016-10-05 20:34:50 +01:00
Nicola Soranzo 2899372791 Update conda_faq.rst 2016-10-03 19:46:27 +01:00
Martin Cech ba274e37f2 describe the conda installation behavior a bit better 2016-10-03 14:31:46 -04:00
Martin Cech 375ed8cc81 polish resolvers section in conda faq docs 2016-10-03 13:20:15 -04:00
Enis Afgan 97b748c73a Shorten Conda environment naming as per https://github.com/galaxyproject/galaxy/commit/e9d81500caa3526200b204270aca175839f36f56
Thanks @lparsons.
2016-09-02 10:34:56 -04:00
Enis Afgan ecdbf4d0b5 Address PR #2891 comments 2016-09-01 17:01:56 -04:00
Enis Afgan 07cf96c260 Update Conda FAQ 2016-09-01 15:55:54 -04:00
Marius van den Beek e645036973 Merge pull request #2871 from remimarenco/patch-8
Add the <conda_prefix> in 12. and fix typo
2016-08-30 13:18:33 +02:00
Rémi Marenco 579ea41085 Update Marius advice 2016-08-30 05:08:26 -04:00
Rémi Marenco 040dd33980 Fix typo 2016-08-29 19:42:10 -04:00
Rémi Marenco d86ee37060 Add the <conda_prefix> in 12. and fix typo
I am adding the ``<conda_prefix>/envs`` to check for the package to have been properly installed (if people have brought their own Conda).

And fixing ``conda_prefix`` to stay consistent in the doc (``<conda_prefix>``).
2016-08-29 19:20:04 -04:00
Martin Cech 7326498335 improve conda doc to include TOC 2016-08-24 12:25:10 -04:00
Martin Cech 779c357dca Merge branch 'docs_conda' of https://github.com/martenson/galaxy into docs_conda 2016-08-24 11:43:13 -04:00
Martin Cech 3d0bf645ab fix tiny things in docs 2016-08-24 11:28:32 -04:00
Dannon Baker e52dbde3e4 Conda/conda standardization 2016-08-23 17:45:56 -04:00
Martin Cech aedfdffafe add more literal includes 2016-08-23 17:41:07 -04:00
Martin Cech 453c98d8ad this one is even weirder than the ones before 2016-08-23 17:35:03 -04:00
Martin Cech e33f8fe5b6 replace apostrophes 2016-08-23 17:33:25 -04:00
Martin Cech 04f22b70a4 fix plural, split lines to prevent indentation 2016-08-23 17:14:27 -04:00
Martin Cech 01a24f6560 rst problems 2016-08-23 15:53:37 -04:00
Martin Cech 4d19755c13 add conda docs converted and modified from IUC googledoc 2016-08-23 15:44:46 -04:00
Eric Rasche c6c646ead4 Document the Chat Server 2016-08-23 18:18:30 +00:00
John Chilton 8dbf987e10 Merge pull request #2455 from erasche/grt
Galactic Radio Telescope
2016-07-21 20:06:12 -04:00
Peter van Heusden cd0932600f Modified Apache/nginx settings suggestions 2016-06-25 23:26:24 +02:00
Peter van Heusden 63abe20ab8 Replace single with ` 2016-06-25 22:57:36 +02:00
Peter van Heusden e73a8071f5 Addressed @erasche's comments 2016-06-25 21:42:25 +02:00
Peter van Heusden d02f1f1d6a * Update docs on Interactive Environments
* Move docs on writing IEs to developer docs
2016-06-25 20:54:37 +02:00
Eric Rasche bf8f8e2d08 Document GRT 2016-06-04 16:19:26 +00:00
Dannon Baker a7b1ce7670 Update doc 2016-03-09 09:09:52 -05:00
Nate Coraor 9c7c75b766 Typo 2016-02-05 09:45:30 -05:00
Nate Coraor 4b24d95f6f Improve documentation about binary-compatibility.cfg. Resolves #1672. 2016-02-04 11:07:31 -05:00
Nate Coraor 33ba1face9 Link from the 16.01 announcement to the Admin wheels documentation,
document the process of adding new wheels.
2016-01-28 13:13:09 -05:00
Nate Coraor 168f453094 Suggest installing virtualenv from brew 2016-01-26 16:49:39 -05:00
Nate Coraor 9827f32775 conda-requirements.txt renamed to conda-environment.txt 2016-01-26 16:48:38 -05:00
Nate Coraor dc801dc1f6 Add admin documentation for framework dependencies (wheels) for the
16.01 release.
2016-01-26 16:17:49 -05:00
John Chilton 1148081435 Implement a conda dependency resolver.
Much more information on planemo PR that I used to build a test bed for this:

https://github.com/galaxyproject/planemo/pull/392

Also syncs galaxy with planemo shared library changed.
2015-12-26 22:46:28 +00:00
John Chilton 6580d51293 Merge pull request #1296 from pvanheus/env-modules-resolve
Documentation for dependency resolvers
2015-12-11 15:00:19 -05:00
Peter van Heusden 73b6fb23db * Replaced all references to "version number" with "version string" 2015-12-11 20:53:00 +02:00
Peter van Heusden 035f1b5d66 * Incorporate documentation fixes from nsoranzo
* Replace {} and .format with %s and % to preserve Python 2.6 compatibility
    * Add a modulepath= paranter to the fake resolver (Bunch object) used to test the modules dependency resolver
2015-12-11 20:43:03 +02:00
Peter van Heusden 584d886b5e * Mention modulepath attribute in dependency resolver docs
* Use modulepath in both environment modules resolvers
* Export MODULEPATH in generated shell command
* Add logging for operation of dependency resolvers
2015-12-11 20:06:13 +02:00
Peter van Heusden e40fbe5374 * Add comment about base_path in sample config
* Add documentation on dependency resolvers
2015-12-11 07:31:10 +02:00
Nate Coraor 72faca1a3a Document GIE proxy config for nginx, mention the Ansible role. 2015-11-18 14:15:40 -05:00
Eric Rasche 5dd7370b84 Add a line of documentation about syncing 2015-10-15 16:06:23 -05:00
Eric Rasche 705445a2f2 Correct doc script name 2015-10-14 14:51:21 -05:00
Eric Rasche 1f9be2410b Documented use of library upload tool 2015-10-14 14:48:30 -05:00
Nitesh Turaga 5b93a66fae Added missing lib/main.js 2015-10-07 15:06:21 -04:00
Eric Rasche 86aa3ca22b Document that this isn't the primary admin docs 2015-09-29 12:20:35 -05:00
Eric Rasche 76db6d5274 Link to the wiki 2015-09-29 10:06:25 -05:00