-
Notifications
You must be signed in to change notification settings - Fork 967
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/dev' into api.batch
- Loading branch information
Showing
1,338 changed files
with
42,402 additions
and
27,525 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| .venv/ | ||
| contrib/ | ||
| client/ | ||
| database/ | ||
| doc/patch.py | ||
| doc/source/conf.py | ||
| lib/galaxy/model/migrate/versions/ | ||
| lib/galaxy/model/tool_shed_install/migrate/versions/ | ||
| lib/galaxy/util/pastescript/serve.py | ||
| lib/galaxy/webapps/tool_shed/model/migrate/versions/ | ||
| lib/galaxy_utils/ | ||
| lib/pkg_resources.py | ||
| lib/tool_shed/ | ||
| scripts/api/ | ||
| scripts/data_libraries/ | ||
| scripts/loc_files/ | ||
| scripts/microbes/ | ||
| scripts/others/ | ||
| scripts/scramble/ | ||
| scripts/tool_shed/ | ||
| scripts/tools/ | ||
| scripts/transfer.py | ||
| test/base/ | ||
| test/casperjs/ | ||
| test/install_and_test_tool_shed_repositories/ | ||
| test/tool_shed/ | ||
| tools/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,15 @@ | ||
| language: python | ||
| python: | ||
| - "2.7" | ||
| - "2.6" | ||
| python: 2.7 | ||
| env: | ||
| - TOX_ENV=py27-lint | ||
| - TOX_ENV=py26-lint | ||
| - TOX_ENV=py27-unit | ||
| - TOX_ENV=py26-unit | ||
| - TOX_ENV=qunit | ||
|
|
||
| install: | ||
| - virtualenv .venv | ||
| - . .venv/bin/activate | ||
| - pip install flake8 | ||
| script: ./.ci/flake8_wrapper.sh && ./run_tests.sh -u | ||
| - pip install tox | ||
| - if [ "$TOX_ENV" == "qunit" ]; then bash -c 'cd test/qunit && npm install'; fi | ||
|
|
||
| script: tox -e $TOX_ENV | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| # Contributors | ||
|
|
||
| The following individuals have contributed code to Galaxy: | ||
|
|
||
| * Enis Afgan <afgane@gmail.com> | ||
| * Istvan Albert <istvan.albert@gmail.com> | ||
| * Renato Alves <alves.rjc@gmail.com> <rjalves@igc.gulbenkian.pt> | ||
| * Guruprasad Ananda <gua110@bx.psu.edu> | ||
| * Florent Angly <florent.angly@gmail.com> | ||
| * Raj Ayyampalayam <raj76@uga.edu> | ||
| * Finn Bacall <finn.bacall@cs.man.ac.uk> | ||
| * Dannon Baker <dannon.baker@gmail.com> | ||
| * Christopher Bare <christopherbare@gmail.com> | ||
| * Dan Blanchard <dan.blanchard@gmail.com> | ||
| * Daniel Blankenberg <dan.blankenberg@gmail.com> <dan@bx.psu.edu> | ||
| * James Boocock <sfk2001@gmail.com> | ||
| * Carlos Borroto <carlos.borroto@gmail.com> | ||
| * Daniel Bouchard <dbouchard@corefacility.ca> <daniel.bouchard@phac-aspc.gc.ca> | ||
| * Dave Bouvier <dave@bx.psu.edu> | ||
| * Adam Brenner <aebrenne@uci.edu> | ||
| * Anthony Bretaudeau <anthony.bretaudeau@rennes.inra.fr> <abretaud@irisa.fr> | ||
| * Richard Burhans <burhans@bx.psu.edu> | ||
| * Jennifer Cabral <jencabral@gmail.com> | ||
| * Martin Čech <marten@bx.psu.edu> | ||
| * Ramkrishna Chakrabarty <rc@bx.psu.edu> | ||
| * Brad Chapman <chapmanb@50mail.com> | ||
| * John Chilton <jmchilton@gmail.com> | ||
| * Saket Choudhary <saketkc@gmail.com> | ||
| * Wen-Yu Chung <wychung@bx.psu.edu> | ||
| * Dave Clements <clements@galaxyproject.org> | ||
| * Peter Cock <p.j.a.cock@googlemail.com> | ||
| * Ira Cooke <iracooke@gmail.com> | ||
| * Nate Coraor <nate@bx.psu.edu> | ||
| * Michael Cotterell <mepcotterell@gmail.com> | ||
| * Gianmauro Cuccuru <gmauro@crs4.it> | ||
| * Frederik Delaere <frederik.delaere@gmail.com> | ||
| * Olivia Doppelt <olivia.doppelt@pasteur.fr> | ||
| * John Duddy <jduddy@illumina.com> | ||
| * Carl Eberhard <carlfeberhard@gmail.com> | ||
| * Kyle Ellrott <kellrott@gmail.com> <kellrott@soe.ucsc.edu> | ||
| * Eric Enns <eric.enns@gmail.com> | ||
| * Dorine Francheteau <dorine@bx.psu.edu> | ||
| * Jaime Frey <jfrey@cs.wisc.edu> | ||
| * Carie Genote <cganote@iu.edu> | ||
| * Jeremy Goecks <jeremy.goecks@emory.edu> <jgoecks@gwu.edu> | ||
| * Nuwan Goonasekera <nuwan.goonasekera@gmail.com> | ||
| * Björn Grüning <bjoern.gruening@gmail.com> <bjoern@gruenings.eu> | ||
| * Aysam Guerler <aysam.guerler@gmail.com> | ||
| * Simon Guest <simon.guest@agresearch.co.nz> | ||
| * Jianbin He <jbhe@bx.psu.edu> | ||
| * Morita Hideyuki <h-morita@esm.co.jp> | ||
| * Rob Hooft <rob.hooft@nbic.nl> | ||
| * Y. Hoogstrate <y.hoogstrate@erasmusmc.nl> | ||
| * Jian-Long Huang <jlh@pyhub.org> | ||
| * Gert Hulselmans <gert.hulselmans@med.kuleuven.be> | ||
| * Jennifer Jackson <jen@bx.psu.edu> | ||
| * Joachim Jacob <joachim.jacob@gmail.com> | ||
| * Jim Johnson <jj@umn.edu> <jj@msi.umn.edu> | ||
| * Radhesh Kamath <radhesh@bx.psu.edu> | ||
| * Jan Kanis <jan.code@jankanis.nl> | ||
| * David King <dcking@bx.psu.edu> | ||
| * Rory Kirchner <roryk@mit.edu> | ||
| * Brad Langhorst <langhorst@neb.com> | ||
| * Ross Lazarus <ross.lazarus@gmail.com> <rossl@bx.psu.edu> | ||
| * Simone Leo <simone.leo@gmail.com> | ||
| * Kanwei Li <kanwei@gmail.com> | ||
| * Michael Li <michael.li@uwaterloo.ca> | ||
| * Philip Mabon <philipmabon@gmail.com> | ||
| * Remi Marenco <remi.marenco@gmail.com> <remimarenco@gmail.com> | ||
| * Thomas McGowan <mcgo0092@msi.umn.edu> | ||
| * Scott McManus <scottmcmanus@emory.edu> <scottmcmanus@gatech.edu> | ||
| * Hunter Moseley <hunter.moseley@louisville.edu> | ||
| * Arjun Nath <arjun@bx.psu.edu> | ||
| * Anton Nekrutenko <anton@bx.psu.edu> <anton@nekrut.org> | ||
| * Eric Paniagua <paniagua.cshl@gmail.com> | ||
| * Richard Park <rpark@bu.edu> | ||
| * Lance Parsons <lparsons@princeton.edu> | ||
| * Chinmay Rao <chinmay@bx.psu.edu> | ||
| * Eric Rasche <esr@tamu.edu> <rasche.eric@gmail.com> <rasche.eric@yandex.ru> | ||
| * Andrew Robinson <Andrew.Robinson@latrobe.edu.au> | ||
| * Andrea Sbardellati <andrea.sbardellati@crs4.it> | ||
| * Ian Schenck <ian@bx.psu.edu> | ||
| * Nick Semenkovich <semenko@alum.mit.edu> | ||
| * Matthew Shirley <mdshw5@gmail.com> | ||
| * Clare Sloggett <sloc@unimelb.edu.au> | ||
| * Nicola Soranzo <nicola.soranzo@tgac.ac.uk> <nsoranzo@tiscali.it> <soranzo@crs4.it> | ||
| * Roy Storey <kiwiroy@gmail.com> | ||
| * Hanfei Sun <ad9075@gmail.com> | ||
| * Ilya Sytchev <hackdna@gmail.com> | ||
| * James Taylor <james@jamestaylor.org> | ||
| * Tomithy Too <tomithy.too@gmail.com> | ||
| * David Trudgian <dave@trudgian.net> <david.trudgian@utsouthwestern.edu> | ||
| * Nitesh Turaga <nitesh.turaga@gmail.com> | ||
| * Clayton Turner <clayclay911@gmail.com> | ||
| * Marek Vavruša <marek@vavrusa.com> | ||
| * Martijn Vermaat <m.vermaat.hg@lumc.nl> | ||
| * Kelly Vincent <kpvincent@bx.psu.edu> | ||
| * Greg Von Kuster <greg@bx.psu.edu> | ||
| * Hiral Vora <hvora1@uncc.edu> | ||
| * Andrew Warren <anwarren@vbi.vt.edu> | ||
| * Trevor Wennblom <trevor@well.com> | ||
| * Yi Zhang <yizhang@bx.psu.edu> | ||
| * Freek de Bruijn <freek.de.bruijn@nbic.nl> | ||
| * Peter van Heusden <pvh@sanbi.ac.za> | ||
| * Marius van den Beek <m.vandenbeek@gmail.com> | ||
|
|
||
| # Institutional sponsors | ||
|
|
||
| Galaxy development began at The Pennsylvania State University in 2006. | ||
| In 2009 all contributions to that point were licensed by The | ||
| Pennsylvania State University under the terms of the Academic Free | ||
| License 3.0 (see LICENSE.txt). This license applies to all subsequent | ||
| contributions - including but not limited to development at The | ||
| Pennsylvania State University, Emory University, Johns Hopkins | ||
| University, and George Washington University as part of the following | ||
| NIH and NSF grants: | ||
|
|
||
| * NSF DBI 0543285, “Tailoring genomic data to the needs of experimental | ||
| biologists and educators” | ||
| * NIH R21 HG005133, “A turnkey solution for next generation sequence | ||
| data analysis” | ||
| * NIH R01 HG004909, “An efficient lightweight environment for biomedical | ||
| computation” | ||
| * NSF DBI 0850103, “Cyberinfrastructure for accessible and reproducible | ||
| research in life sciences” | ||
| * NIH RC2 HG005542, “Dynamically scalable accessible analysis for next | ||
| generation sequence data” | ||
| * NIH U41 HG006620, “Democratization of data analysis in life sciences | ||
| through Galaxy” |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.