Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 47113bedcabe3c82ad99ea1ef16307f8c3c5512f
https://github.com/galaxyproject/galaxy/commit/47113bedcabe3c82ad99ea1ef163…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M .ci/flake8_blacklist.txt
M client/galaxy/scripts/mvc/library/library-folderlist-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
M client/galaxy/scripts/mvc/tools/tools-form.js
M lib/galaxy/datatypes/registry.py
A lib/galaxy/datatypes/set_metadata_tool.xml
M lib/galaxy/managers/folders.py
M lib/galaxy/managers/libraries.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/imp_exp/__init__.py
A lib/galaxy/tools/imp_exp/exp_history_to_archive.xml
M lib/galaxy/tools/parser/yaml.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/util/__init__.py
M lib/galaxy/webapps/galaxy/api/folders.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/user.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0001_initial_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0002_add_tool_suite_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0003_review_and_review_association_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0004_repository_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0005_drop_tool_related_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0006_add_email_alerts_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0007_add_long_description_times_downloaded_columns.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0008_add_repository_metadata_table.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0009_add_malicious_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0010_add_new_repo_alert_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0011_add_tool_versions_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0012_add_downloadable_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0013_add_review_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0014_add_deprecated_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0015_add_api_keys_table.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0016_add_do_not_test_tools_functionally_correct_errors_columns.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0017_add_galaxy_utility_columns_to_repository_metadata_table.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0018_add_repository_metadata_flag_columns.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0019_add_skip_tool_test_table_and_test_install_error_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0020_add_repository_type_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0021_change_repository_type_value.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0022_add_repository_admin_roles.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0024_password_reset.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0025_session_timeout.py
M lib/pulsar/client/amqp_exchange.py
M static/maps/mvc/library/library-folderlist-view.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
M static/maps/mvc/tools/tools-form.js.map
M static/scripts/mvc/library/library-folderlist-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-model.js
M static/scripts/mvc/tools/tools-form.js
M test/unit/tools/test_parsing.py
Log Message:
-----------
Merge branch 'dev' of github.com:galaxyproject/galaxy into dev
Commit: 5f4502b6500ca0aae57d6d76da12804d5d2fb9d1
https://github.com/galaxyproject/galaxy/commit/5f4502b6500ca0aae57d6d76da12…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample
Log Message:
-----------
Pin images for next release of Galaxy
Commit: e9a3ec95b9485ea3b5b15bce4f8a96751f225b53
https://github.com/galaxyproject/galaxy/commit/e9a3ec95b9485ea3b5b15bce4f8a…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M doc/source/dev/faq.rst
Log Message:
-----------
Update faq.rst
Commit: b5b36c0ab184d38b611fe0b293424bedd687cb28
https://github.com/galaxyproject/galaxy/commit/b5b36c0ab184d38b611fe0b29342…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-10-06 (Tue, 06 Oct 2015)
Changed paths:
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample
Log Message:
-----------
Merge pull request #849 from erasche/gie-pinning-15.10
GIE pinning 15.10
Compare: https://github.com/galaxyproject/galaxy/compare/092fc17ec008...b5b36c0ab184
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 1aebbc3f68ad5a82834edb82ef52e3840fec697b
https://github.com/galaxyproject/galaxy/commit/1aebbc3f68ad5a82834edb82ef52…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
R lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py
R tools/data_source/ucsc_archaea.xml
R tools/data_source/ucsc_filter.py
R tools/data_source/ucsc_proxy.py
R tools/data_source/ucsc_proxy.xml
R tools/data_source/ucsc_testproxy.xml
Log Message:
-----------
Remove likely broken UCSC proxy and associated tools.
Unused for many, many years and likely no longer works.
Commit: a6f9e62c1a4048d3f7669d5783a836d38d6f8f96
https://github.com/galaxyproject/galaxy/commit/a6f9e62c1a4048d3f7669d5783a8…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M tools/data_source/ucsc_tablebrowser.xml
M tools/data_source/ucsc_tablebrowser_archaea.xml
M tools/data_source/ucsc_tablebrowser_test.xml
Log Message:
-----------
Add citations to ucsc browser tools.
Commit: 092fc17ec008f092f016014f30317bdf68b9c567
https://github.com/galaxyproject/galaxy/commit/092fc17ec008f092f016014f3031…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
R lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py
R tools/data_source/ucsc_archaea.xml
R tools/data_source/ucsc_filter.py
R tools/data_source/ucsc_proxy.py
R tools/data_source/ucsc_proxy.xml
M tools/data_source/ucsc_tablebrowser.xml
M tools/data_source/ucsc_tablebrowser_archaea.xml
M tools/data_source/ucsc_tablebrowser_test.xml
R tools/data_source/ucsc_testproxy.xml
Log Message:
-----------
Merge pull request #846 from jmchilton/ucsc_cleanup
UCSC Tool Cleanup
Compare: https://github.com/galaxyproject/galaxy/compare/f90c49e2705e...092fc17ec008
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 591519009b0ead989ddf5a87fee9d5c69216b97c
https://github.com/galaxyproject/galaxy/commit/591519009b0ead989ddf5a87fee9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M tools/sr_mapping/srma_wrapper.xml
M tools/visualization/LAJ.xml
Log Message:
-----------
Add citations to a few more tools.
Commit: 88239abf5c2473af841eea139edc0164b3a4856c
https://github.com/galaxyproject/galaxy/commit/88239abf5c2473af841eea139edc…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M tools/data_source/biomart.xml
M tools/data_source/biomart_test.xml
M tools/sr_mapping/bfast_wrapper.xml
M tools/sr_mapping/fastq_statistics.xml
M tools/sr_mapping/mosaik.xml
Log Message:
-----------
Add more distribution tool citations.
xref #361.
Commit: f90c49e2705ed66bfa668de96568ea53126edc94
https://github.com/galaxyproject/galaxy/commit/f90c49e2705ed66bfa668de96568…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M tools/data_source/biomart.xml
M tools/data_source/biomart_test.xml
M tools/sr_mapping/bfast_wrapper.xml
M tools/sr_mapping/fastq_statistics.xml
M tools/sr_mapping/mosaik.xml
M tools/sr_mapping/srma_wrapper.xml
M tools/visualization/LAJ.xml
Log Message:
-----------
Merge pull request #847 from jmchilton/citations_5
Add more distribution tool citations.
Compare: https://github.com/galaxyproject/galaxy/compare/3201005739ab...f90c49e2705e
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 4e35ff04a116a4a9ca1d96e9b3c5842be9fa9f7f
https://github.com/galaxyproject/galaxy/commit/4e35ff04a116a4a9ca1d96e9b3c5…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M lib/galaxy/jobs/command_factory.py
Log Message:
-----------
More improved file handling for job code.
Another stab in the dark that won't actually fix the testing issues with Docker.
Commit: b75175f18d15000a2dc5826f49424eba6dc7d489
https://github.com/galaxyproject/galaxy/commit/b75175f18d15000a2dc5826f4942…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/cli.py
M lib/galaxy/jobs/runners/condor.py
M lib/galaxy/jobs/runners/drmaa.py
M lib/galaxy/jobs/runners/local.py
M lib/galaxy/jobs/runners/pbs.py
Log Message:
-----------
Centralize logic for writing job scripts.
Runners were using various permissions, some didn't close file handles, etc....
In addition, run sync after script is written to avoid "Text file busy" problems in all job script scenerios.
Commit: 753bb9de0fa031720b8c7881ff1d52cbf6a522d3
https://github.com/galaxyproject/galaxy/commit/753bb9de0fa031720b8c7881ff1d…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M lib/galaxy/jobs/command_factory.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/cli.py
M lib/galaxy/jobs/runners/condor.py
M lib/galaxy/jobs/runners/drmaa.py
M lib/galaxy/jobs/runners/local.py
M lib/galaxy/jobs/runners/pbs.py
Log Message:
-----------
Merge pull request #839 from jmchilton/text_file_busy
Attempt to fix "Text file busy" errors (testing and production)
Compare: https://github.com/galaxyproject/galaxy/compare/bb43ace50927...753bb9de0fa0
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 54410d7d70c13c76ac370e83c12db7810192fc71
https://github.com/galaxyproject/galaxy/commit/54410d7d70c13c76ac370e83c12d…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M lib/galaxy/datatypes/converters/bgzip.py
M lib/galaxy/datatypes/converters/gff_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/interval_to_bed_converter.py
M lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py
M lib/galaxy/datatypes/converters/interval_to_coverage.py
M lib/galaxy/datatypes/converters/interval_to_fli.py
M lib/galaxy/datatypes/converters/interval_to_tabix_converter.py
M lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
M lib/galaxy/datatypes/converters/maf_to_interval_converter.py
M lib/galaxy/datatypes/converters/vcf_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/vcf_to_vcf_bgzip.py
M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py
M lib/galaxy/datatypes/display_applications/util.py
M lib/galaxy/datatypes/interval.py
M lib/galaxy/datatypes/tabular.py
M lib/galaxy/datatypes/util/gff_util.py
Log Message:
-----------
Use eggs.require() instead of pkg_resources in lib/galaxy/datatypes/ .
Fix https://github.com/galaxyproject/galaxy/issues/809#issuecomment-145107037 .
Commit: 3687d45a037166e2fffcdfe7fda4cfd6d2b08346
https://github.com/galaxyproject/galaxy/commit/3687d45a037166e2fffcdfe7fda4…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M lib/galaxy/datatypes/converters/bgzip.py
M lib/galaxy/datatypes/converters/gff_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/interval_to_bed_converter.py
M lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py
M lib/galaxy/datatypes/converters/interval_to_coverage.py
M lib/galaxy/datatypes/converters/interval_to_fli.py
M lib/galaxy/datatypes/converters/interval_to_tabix_converter.py
M lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
M lib/galaxy/datatypes/converters/maf_to_interval_converter.py
M lib/galaxy/datatypes/converters/vcf_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/vcf_to_vcf_bgzip.py
M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py
M lib/galaxy/datatypes/display_applications/util.py
M lib/galaxy/datatypes/interval.py
M lib/galaxy/datatypes/tabular.py
M lib/galaxy/datatypes/util/gff_util.py
Log Message:
-----------
Merge pull request #838 from nsoranzo/pkg_resources
Use eggs.require() instead of pkg_resources in lib/galaxy/datatypes/ .
Compare: https://github.com/galaxyproject/galaxy/compare/0a83a244f170...3687d45a0371
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 2210f83da95b702ea10f7809b29ee77d54fc1529
https://github.com/galaxyproject/galaxy/commit/2210f83da95b702ea10f7809b29e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
R run_functional_tests.sh
Log Message:
-----------
Remove run_functional_tests.sh.
It has been deprecated who a while and removed once already - hopefully now we can kill it.
Commit: 596f9116f25f384899f9c7acb5517d57b88ca358
https://github.com/galaxyproject/galaxy/commit/596f9116f25f384899f9c7acb551…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
Use framework test tools for --api and --casperjs tests.
These tests are explicitly designed to test the framework and use a tool panel. ``sh run_tests.sh`` and ``sh run_tests.sh -id`` are meant to test Galaxy's configuration to some degree, and other tests qunit, unit, and toolshed do not depend on the toolbox.
Commit: 0a83a244f170226ec02f41a9972bd9bfcb261449
https://github.com/galaxyproject/galaxy/commit/0a83a244f170226ec02f41a9972b…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
R run_functional_tests.sh
M run_tests.sh
Log Message:
-----------
Merge pull request #844 from jmchilton/run_test_adjustments
More small adjustments to test script.
Compare: https://github.com/galaxyproject/galaxy/compare/7dcd2636fd83...0a83a244f170
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: f64a23fbe16d2af956840ffef673f6455700249f
https://github.com/galaxyproject/galaxy/commit/f64a23fbe16d2af956840ffef673…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-09-29 (Tue, 29 Sep 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
M static/maps/mvc/library/library-librarylist-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
Log Message:
-----------
initial implementation of library search
Commit: 91ef04a25bdc5962ce650d925db5f8a94c345d06
https://github.com/galaxyproject/galaxy/commit/91ef04a25bdc5962ce650d925db5…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-09-29 (Tue, 29 Sep 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/scripts/mvc/library/library-librarytoolbar-view.js
Log Message:
-----------
docs, refac and indentation
Commit: 7dcd2636fd83dc935306cbd405091c60c1d54bdf
https://github.com/galaxyproject/galaxy/commit/7dcd2636fd83dc935306cbd40509…
Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
M static/maps/mvc/library/library-librarylist-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
Log Message:
-----------
Merge pull request #820 from martenson/lib-search
Initial implementation of data library search
Compare: https://github.com/galaxyproject/galaxy/compare/51a3f5414064...7dcd2636fd83