Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9dc9ddf8cdede7c62d4ba5f00283675b872891e4 https://github.com/galaxyproject/galaxy/commit/9dc9ddf8cdede7c62d4ba5f002836... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M run.sh M run_tests.sh M scripts/common_startup.sh Log Message: ----------- Add --replace-pip option to common_startup.sh. Needed to restore correct functionality to planemo. Commit: 8fd83df6652a40882bcc3ca8a1db917887b71c11 https://github.com/galaxyproject/galaxy/commit/8fd83df6652a40882bcc3ca8a1db9... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M run.sh M run_tests.sh M scripts/common_startup.sh Log Message: ----------- Allow override of location of virtual env Galaxy manages. Commit: b559cf303c1b14aa862ba394d7bc868bc517db5a https://github.com/galaxyproject/galaxy/commit/b559cf303c1b14aa862ba394d7bc8... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M setup.cfg Log Message: ----------- Drop E731 from flake8 enforcement (though we should revisit this and see if we *do* want to follow this or not) Commit: 2f1dbeee68ddd75a561fe0f463d5b9968278ef13 https://github.com/galaxyproject/galaxy/commit/2f1dbeee68ddd75a561fe0f463d5b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/rbac_secured.py M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py M lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py M lib/galaxy/model/migrate/versions/0067_populate_sequencer_table.py M lib/galaxy/util/pastescript/loadwsgi.py M lib/pulsar/client/amqp_exchange.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M test/casperjs/casperjs_runner.py Log Message: ----------- Address W503 and E721 errors now enforced by pep8 1.7. Commit: 86158cbc7fb601d0f3563fa2bea67e23b464db93 https://github.com/galaxyproject/galaxy/commit/86158cbc7fb601d0f3563fa2bea67... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/rbac_secured.py M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py M lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py M lib/galaxy/model/migrate/versions/0067_populate_sequencer_table.py M lib/galaxy/util/pastescript/loadwsgi.py M lib/pulsar/client/amqp_exchange.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M setup.cfg M test/casperjs/casperjs_runner.py Log Message: ----------- Merge pull request #1487 from dannon/release_16.01 [16.01] Cherrypick of pep8 fixes. Commit: becffe93a3f78ca74b5d093974844a3634e1ed6b https://github.com/galaxyproject/galaxy/commit/becffe93a3f78ca74b5d093974844... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M run.sh M run_tests.sh M scripts/common_startup.sh Log Message: ----------- Merge pull request #1485 from jmchilton/common_startup_fixes [16.01] Fix common_startup options for planemo. Commit: e13fb12569a84c78b23b71e0f90bcea13439bc53 https://github.com/galaxyproject/galaxy/commit/e13fb12569a84c78b23b71e0f90bc... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M run.sh M run_tests.sh M scripts/common_startup.sh Log Message: ----------- Merge remote-tracking branch 'jmchilton/release_16.01' into dev_merge_0 Commit: 91fe9d09aab5e78115ba87c42406b709796119dc https://github.com/galaxyproject/galaxy/commit/91fe9d09aab5e78115ba87c42406b... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M run.sh M run_tests.sh M scripts/common_startup.sh Log Message: ----------- Merge pull request #1497 from jmchilton/dev_merge_0 Merge 16.01 into dev. Compare: https://github.com/galaxyproject/galaxy/compare/790953e6e786...91fe9d09aab5