- galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] 562432: Add framework_py3 test target
by GitHub 16 Aug '18

16 Aug '18

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 5624323a337a5d6176d3bb9be3bef599e65167b1 https://github.com/galaxyproject/galaxy/commit/5624323a337a5d6176d3bb9be3be… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: A .ci/jenkins/framework-py3/run_tests.sh M run_tests.sh Log Message: ----------- Add framework_py3 test target Commit: fc464f975878867ddc8ef90818db9faab31c7368 https://github.com/galaxyproject/galaxy/commit/fc464f975878867ddc8ef90818db… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M test/functional/tools/metadata_biom1.xml Log Message: ----------- Allow 4 lines diff to acount for the prefix of python2 unicode strings Commit: 58067b4c896df7f2f48f3c7b6f4c92f9c6d6f265 https://github.com/galaxyproject/galaxy/commit/58067b4c896df7f2f48f3c7b6f4c… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/datatypes/data.py Log Message: ----------- Fix count_lines function for compressed datatypes that inherit from Text Commit: 79ec064214030badbc64694213db0ce4865b5e64 https://github.com/galaxyproject/galaxy/commit/79ec064214030badbc64694213db… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/datatypes/text.py Log Message: ----------- py3: Fix Biom1 datatype Commit: 37132212fe5e1fdf7f43e41c59eac051bfb8f389 https://github.com/galaxyproject/galaxy/commit/37132212fe5e1fdf7f43e41c59ea… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/jobs/splitters/multi.py Log Message: ----------- py3: Fix file splitting for parallelism Commit: f831c616cb418f72baa1aae420b47a49a0aacc3c https://github.com/galaxyproject/galaxy/commit/f831c616cb418f72baa1aae420b4… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/tools/wrappers.py Log Message: ----------- py3: fix paths_as_file functionality Commit: 70640071224745f61d756ed1475b5a03c85f4f40 https://github.com/galaxyproject/galaxy/commit/70640071224745f61d756ed1475b… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/util/object_wrapper.py Log Message: ----------- Don't log error to provide arguments to __new__ for types that don't take arguments This is just very verbose and unneeded. Commit: ea0e3ffeb779fee900aa8dbc33773a921e39ec9c https://github.com/galaxyproject/galaxy/commit/ea0e3ffeb779fee900aa8dbc3377… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/tools/parameters/output_collect.py Log Message: ----------- py3: Fix dataset dataset collection Commit: a927413df22ff3454cf6c691f851cf54673eefb7 https://github.com/galaxyproject/galaxy/commit/a927413df22ff3454cf6c691f851… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M test/functional/tools/parallelism.xml M test/functional/tools/parallelism_optional.xml Log Message: ----------- Use exit code and quote file parameters for paralellism test tools Commit: b041e41155ac18252c46364ac409a9695d9f8bfb https://github.com/galaxyproject/galaxy/commit/b041e41155ac18252c46364ac409… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/tools/evaluation.py Log Message: ----------- Write configfile in binary mode This fixes the unicode_stream tool on docker. Commit: 79decc3ba77c5fbcaf36a0cbb9aace16512bcf9d https://github.com/galaxyproject/galaxy/commit/79decc3ba77c5fbcaf36a0cbb9aa… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: M lib/galaxy/tools/execute.py Log Message: ----------- Use OrderedDict to collect implicit collections This should fix randomly failing tests that rely on the order of the implcit collection elements, like `test_map_over_two_collections_unlinked`. Commit: c430d4a6509375c5aaf658f149b3038aa8f34883 https://github.com/galaxyproject/galaxy/commit/c430d4a6509375c5aaf658f149b3… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: M test/base/driver_util.py Log Message: ----------- Fix selenium test setup Commit: 3957ed91e2d25faae9100c85bc19b9a1c5b3d68e https://github.com/galaxyproject/galaxy/commit/3957ed91e2d25faae9100c85bc19… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: M templates/display_common.mako M templates/legacy/grid_base.mako M templates/tagging_common.mako M templates/webapps/tool_shed/repository/tool_form.mako Log Message: ----------- Fix errors found during selenium testing Commit: ae9effa61005504c51ca11adbbf6b70f95fab3b8 https://github.com/galaxyproject/galaxy/commit/ae9effa61005504c51ca11adbbf6… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: A .ci/jenkins/selenium-py3/run_tests.sh Log Message: ----------- Add selenium py3 jenkins setup Commit: fb86e96bffecaef3861ce68db963c22aee193d54 https://github.com/galaxyproject/galaxy/commit/fb86e96bffecaef3861ce68db963… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: M lib/galaxy/web/framework/helpers/grids.py Log Message: ----------- Skip decoding to unicode strings in grids At this point we should not have bytestrings anymore (we might, but if we do we should fix that instead). Commit: 7559b90a692a72da2556c61b65c8615ddff822a5 https://github.com/galaxyproject/galaxy/commit/7559b90a692a72da2556c61b65c8… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: M test/base/driver_util.py M test/functional/test_toolbox.py A test/functional/test_toolbox_pytest.py Log Message: ----------- Setup a simple pytest tool test Commit: d9f394793897a4429664027cbdaacbb8fca6d4e2 https://github.com/galaxyproject/galaxy/commit/d9f394793897a4429664027cbdaa… Author: Dannon <dannon.baker(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: A .ci/jenkins/framework-py3/run_tests.sh A .ci/jenkins/selenium-py3/run_tests.sh M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/text.py M lib/galaxy/jobs/splitters/multi.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/web/framework/helpers/grids.py M run_tests.sh M templates/display_common.mako M templates/legacy/grid_base.mako M templates/tagging_common.mako M templates/webapps/tool_shed/repository/tool_form.mako M test/base/driver_util.py M test/functional/test_toolbox.py A test/functional/test_toolbox_pytest.py M test/functional/tools/metadata_biom1.xml M test/functional/tools/parallelism.xml M test/functional/tools/parallelism_optional.xml Log Message: ----------- Merge pull request #6605 from mvdbeek/enable_and_fix_framework_py3_test Enable and fix framework py3 tests Compare: https://github.com/galaxyproject/galaxy/compare/b9ca3b7c3396...d9f394793897 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/galaxy] c6b593: Migrate API tests in test_jobs.py to use test_hist...
by GitHub 16 Aug '18

16 Aug '18

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c6b593b1ca6efa0ef60b1e9fdbed10022bf9fc4e https://github.com/galaxyproject/galaxy/commit/c6b593b1ca6efa0ef60b1e9fdbed… Author: John Chilton <jmchilton(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M test/api/test_jobs.py Log Message: ----------- Migrate API tests in test_jobs.py to use test_history context. More configurable, better error reporting, cleans up jobs, etc.. Commit: b9ca3b7c339628ac017ffc27a91659dce87c4a96 https://github.com/galaxyproject/galaxy/commit/b9ca3b7c339628ac017ffc27a916… Author: Dannon <dannon.baker(a)gmail.com> Date: 2018-08-16 (Thu, 16 Aug 2018) Changed paths: M test/api/test_jobs.py Log Message: ----------- Merge pull request #6593 from jmchilton/toward_test_history_cleaning Migrate API tests in test_jobs.py to use test_history context. Compare: https://github.com/galaxyproject/galaxy/compare/318fc0994903...b9ca3b7c3396 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/galaxy] 283947: Update ucsc genome-test server URL.
by GitHub 15 Aug '18

15 Aug '18

Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: 2839475967320b7d95ade125e542625c6d54c1b9 https://github.com/galaxyproject/galaxy/commit/2839475967320b7d95ade125e542… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M cron/build_chrom_db.py M cron/parse_builds_3_sites.py M tools/data_source/ucsc_tablebrowser_test.xml Log Message: ----------- Update ucsc genome-test server URL. Commit: 1cd36e3f815b6ad06da7a1aa1ee2c56d67edc36c https://github.com/galaxyproject/galaxy/commit/1cd36e3f815b6ad06da7a1aa1ee2… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M tools/data_source/ucsc_tablebrowser_test.xml Log Message: ----------- Bump version; 'patch' since it should be the exact same, as much as anything over the net ever could be\? Commit: 709e49f104e2cba5d180bffb0ed0fee175f5ffba https://github.com/galaxyproject/galaxy/commit/709e49f104e2cba5d180bffb0ed0… Author: John Chilton <jmchilton(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M cron/build_chrom_db.py M cron/parse_builds_3_sites.py M tools/data_source/ucsc_tablebrowser_test.xml Log Message: ----------- Merge pull request #6591 from dannon/ucsc-test-server-domain [18.05] Update UCSC genome-test server URLs Compare: https://github.com/galaxyproject/galaxy/compare/7e445be502a6...709e49f104e2 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/galaxy] 5de98d: add trr datatype
by GitHub 15 Aug '18

15 Aug '18

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 5de98d84709bceba887f040760763abf5500b096 https://github.com/galaxyproject/galaxy/commit/5de98d84709bceba887f04076076… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M lib/galaxy/datatypes/binary.py Log Message: ----------- add trr datatype Commit: 0c2dc3aafb684fc13458ba682eb1c46fa6054d7e https://github.com/galaxyproject/galaxy/commit/0c2dc3aafb684fc13458ba682eb1… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: A lib/galaxy/datatypes/test/em.trr Log Message: ----------- add trr example file Commit: 572b9ced2dada0c5a99d52f6de3886ad85b9d368 https://github.com/galaxyproject/galaxy/commit/572b9ced2dada0c5a99d52f6de38… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M lib/galaxy/datatypes/binary.py Log Message: ----------- no edam format know yet Commit: e42829f03604c8ba0d4a467027c3c3eb689e8395 https://github.com/galaxyproject/galaxy/commit/e42829f03604c8ba0d4a467027c3… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- register datatype Commit: 318fc0994903d3598d9a62e1c8718cb7cde53bfe https://github.com/galaxyproject/galaxy/commit/318fc0994903d3598d9a62e1c871… Author: John Chilton <jmchilton(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py A lib/galaxy/datatypes/test/em.trr Log Message: ----------- Merge pull request #6597 from bgruening/trr add trr datatype Compare: https://github.com/galaxyproject/galaxy/compare/ef0a51537e56...318fc0994903 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/galaxy] 3f032f: Rework and simplify data manager testing
by GitHub 15 Aug '18

15 Aug '18

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3f032f6c383b108946f77f8fd6b7a02e98d474e1 https://github.com/galaxyproject/galaxy/commit/3f032f6c383b108946f77f8fd6b7… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M lib/galaxy/tools/verify/interactor.py M scripts/functional_tests.py M test/functional/test_data_managers.py M test/functional/test_toolbox.py Log Message: ----------- Rework and simplify data manager testing We don't rely on TwillTestCase anymore, that is now exclusively used by ShedTwillTestCase. Then I've just re-used the infrastructure of ToolsTestCase for discovering tests, while making sure that we do use an admin API key during testing. Commit: e21d94298d5d215a0f4f31dae26848388c593590 https://github.com/galaxyproject/galaxy/commit/e21d94298d5d215a0f4f31dae268… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Look in self.tool_dir if repository_dir is not available Commit: ef0a51537e56e3257532df258494a00a8f7c2506 https://github.com/galaxyproject/galaxy/commit/ef0a51537e56e3257532df258494… Author: John Chilton <jmchilton(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/verify/interactor.py M scripts/functional_tests.py M test/functional/test_data_managers.py M test/functional/test_toolbox.py Log Message: ----------- Merge pull request #6595 from mvdbeek/modernize_data_manager_testing_strip_twill Modernize data manager testing and strip twill Compare: https://github.com/galaxyproject/galaxy/compare/55756ba12de6...ef0a51537e56 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/galaxy] 6cbb57: Fix Location of Plugin Static Content
by GitHub 15 Aug '18

15 Aug '18

Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: 6cbb574553a882b7573d86f25bede17e7293cc76 https://github.com/galaxyproject/galaxy/commit/6cbb574553a882b7573d86f25bed… Author: Matthew Spelchak <mrs11teen(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M doc/source/admin/special_topics/interactive_environments.rst Log Message: ----------- Fix Location of Plugin Static Content Commit: 7e445be502a64213c96cb233200aa0f53a2821f4 https://github.com/galaxyproject/galaxy/commit/7e445be502a64213c96cb233200a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2018-08-15 (Wed, 15 Aug 2018) Changed paths: M doc/source/admin/special_topics/interactive_environments.rst Log Message: ----------- Merge pull request #6602 from phac-nml/ie_documentation_fix [18.05] Fix Location of Plugin Static Content In Documentation for 18.05 Compare: https://github.com/galaxyproject/galaxy/compare/1ddaf4a64d63...7e445be502a6 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/usegalaxy-playbook] 0052c0: Fix CORS for InterMine
by GitHub 14 Aug '18

14 Aug '18

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 0052c0badc0e3aaf69657b71ca4af78a927fb375 https://github.com/galaxyproject/usegalaxy-playbook/commit/0052c0badc0e3aaf… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M env/test/templates/nginx/galaxy_test.j2 Log Message: ----------- Fix CORS for InterMine **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/galaxy] 683ef6: Improve robustness of tour Selenium test.
by GitHub 14 Aug '18

14 Aug '18

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 683ef6eceea208c5c244bb9fe895b5e591dcb8df https://github.com/galaxyproject/galaxy/commit/683ef6eceea208c5c244bb9fe895… Author: John Chilton <jmchilton(a)gmail.com> Date: 2018-08-09 (Thu, 09 Aug 2018) Changed paths: M test/galaxy_selenium/navigates_galaxy.py Log Message: ----------- Improve robustness of tour Selenium test. Give the URL upload jobs a bit more time to complete. https://github.com/galaxyproject/galaxy/issues/6581 might also improve this - I'm not sure. Commit: 55756ba12de6f40db077576d3bae961aea6f190d https://github.com/galaxyproject/galaxy/commit/55756ba12de6f40db077576d3bae… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M test/galaxy_selenium/navigates_galaxy.py Log Message: ----------- Merge pull request #6582 from jmchilton/selenium_fixes_45 Improve robustness of tour Selenium test. Compare: https://github.com/galaxyproject/galaxy/compare/853b2d03abcf...55756ba12de6 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/usegalaxy-playbook] 7386b9: Install cutadapt v1.16
by GitHub 14 Aug '18

14 Aug '18

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 7386b956b04bd475479d557225ffc2d2c8873842 https://github.com/galaxyproject/usegalaxy-playbook/commit/7386b956b04bd475… Author: Dave B <dave(a)bx.psu.edu> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M env/test/files/galaxy/galaxy_version.yml M env/test/files/galaxy/var/integrated_tool_panel.xml M env/test/files/galaxy/var/shed_tool_conf.xml M env/test/files/galaxy/var/shed_tool_data_table_conf.xml Log Message: ----------- Install cutadapt v1.16 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[galaxyproject/galaxy] bd9213: Setup pytest python3 API testing
by GitHub 14 Aug '18

14 Aug '18

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bd921368413002f6b57e0c6ee229b2ff06e7482d https://github.com/galaxyproject/galaxy/commit/bd921368413002f6b57e0c6ee229… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M lib/galaxy/dependencies/pipfiles/develop/Pipfile M lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt A pytest.ini M run_tests.sh M scripts/plugin_staging.py M test/docker/base/Dockerfile M test/docker/base/run_test_wrapper.sh Log Message: ----------- Setup pytest python3 API testing Commit: 1b3f5550548741370e70ff2b25bc404e84d2594e https://github.com/galaxyproject/galaxy/commit/1b3f5550548741370e70ff2b25bc… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Bump docker image version Commit: 7342a7ebbc404c275fb0635c1628eecb92b56ff5 https://github.com/galaxyproject/galaxy/commit/7342a7ebbc404c275fb0635c1628… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M test/docker/base/Dockerfile Log Message: ----------- Avoid prepopulating database twice Commit: 4e3a981003f9bd0c99a604327e17f37e16f07f33 https://github.com/galaxyproject/galaxy/commit/4e3a981003f9bd0c99a604327e17… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Temporarily run tests with image published in my channel Commit: 661b3101c635fc376d9c16878fd8b23122ab4950 https://github.com/galaxyproject/galaxy/commit/661b3101c635fc376d9c16878fd8… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: A .ci/jenkins/api-py3/run_tests.sh Log Message: ----------- Add py3 build script for jenkins Commit: 39e1877ccedd36242bc93696d897f62d5c8f0126 https://github.com/galaxyproject/galaxy/commit/39e1877ccedd36242bc93696d897… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M test/docker/base/Dockerfile Log Message: ----------- Explicitly create a python 3 virtualenv Commit: 5b02f5ccedd87a9d529d19a49950df57cc29a8cf https://github.com/galaxyproject/galaxy/commit/5b02f5ccedd87a9d529d19a49950… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Bump docker image version Commit: eb1cb57f424d7ab286658699d2313621ed9e1d4e https://github.com/galaxyproject/galaxy/commit/eb1cb57f424d7ab286658699d231… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M test/docker/base/Dockerfile Log Message: ----------- Fix up Dockerfile for bdbag installation Commit: 091ba0f32c75b6046938c95b0521b3271d9c3a72 https://github.com/galaxyproject/galaxy/commit/091ba0f32c75b6046938c95b0521… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Use 18.09.0 tag Commit: 327ec3d4e9e9d0ab15ae07c2cd0596d6a8abbe90 https://github.com/galaxyproject/galaxy/commit/327ec3d4e9e9d0ab15ae07c2cd05… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M .ci/jenkins/api-py3/run_tests.sh Log Message: ----------- Do use python 3 Commit: a6b78e7a614aaf3e8254fdea32723f6f06678b5e https://github.com/galaxyproject/galaxy/commit/a6b78e7a614aaf3e8254fdea3272… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M test/base/populators.py Log Message: ----------- Decode bytestring returned by source_string Commit: d659d91d331eb434221940a1cddbd5458d75d8b3 https://github.com/galaxyproject/galaxy/commit/d659d91d331eb434221940a1cddb… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M lib/galaxy/web/framework/middleware/batch.py Log Message: ----------- Decode body when using json.loads in batch middleware Commit: 61fa9711dc406dc15b434630aff3c3497f18fd52 https://github.com/galaxyproject/galaxy/commit/61fa9711dc406dc15b434630aff3… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M test/base/populators.py M test/base/rules_test_data.py Log Message: ----------- More resource_string fixes Commit: 03f80f8aef781908f4290f613de9ee78f58b632c https://github.com/galaxyproject/galaxy/commit/03f80f8aef781908f4290f613de9… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M lib/galaxy/model/custom_types.py Log Message: ----------- Patch LargeBinary to cast strings to bytestring I don't fully understand the issue, and we might be accumulating technical debt here. What I'm seeing without this commit is this when I run for instance the VisualizationsApiTestCase.test_create API test. ``` Traceback (most recent call last): File "/galaxy/lib/galaxy/web/framework/decorators.py", line 283, in decorator rval = func(self, trans, *args, **kwargs) File "/galaxy/lib/galaxy/webapps/galaxy/api/visualizations.py", line 55, in index visualizations = self.get_visualizations_by_user(trans, user) File "/galaxy/lib/galaxy/web/base/controller.py", line 664, in get_visualizations_by_user return query.all() File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/query.py", line 2737, in all return list(self) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/loading.py", line 98, in instances util.raise_from_cause(err) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/util/compat.py", line 203, in raise_from_cause reraise(type(exception), exception, tb=exc_tb, cause=cause) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/util/compat.py", line 187, in reraise raise value File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/loading.py", line 79, in instances rows = [proc(row) for row in fetch] File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/loading.py", line 79, in <listcomp> rows = [proc(row) for row in fetch] File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/loading.py", line 493, in _instance loaded_instance, populate_existing, populators) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/loading.py", line 604, in _populate_full populator(state, dict_, row) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/strategies.py", line 1782, in load_scalar_from_joined_new_row dict_[key] = _instance(row) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/loading.py", line 493, in _instance loaded_instance, populate_existing, populators) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/orm/loading.py", line 593, in _populate_full dict_[key] = getter(row) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/sql/type_api.py", line 1204, in process return process_value(impl_processor(value), dialect) File "/galaxy_venv3/lib/python3.5/site-packages/sqlalchemy/sql/sqltypes.py", line 902, in process value = bytes(value) TypeError: string argument without an encoding ``` I think LargeBinary isn't meant to store strings the way we do this (we dump JSON as bytestring), and somehow on python 3 we get unicode strings back from the database, which blows up here. I suspect this might be configured on the connection level (see http://docs.sqlalchemy.org/en/latest/dialects/postgresql.html#unicode) but not blowing up here seems like a good default. Commit: 2527038ffce1f7f1b987f9318671bc4fec567ec0 https://github.com/galaxyproject/galaxy/commit/2527038ffce1f7f1b987f9318671… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M run_tests.sh M test/docker/base/run_test_wrapper.sh Log Message: ----------- Mount in run_tests script at container runtime This allows changing variables in the script without rebuilding the container Commit: 3d9c0b154ab744345808d36c8af38972524ab2c3 https://github.com/galaxyproject/galaxy/commit/3d9c0b154ab744345808d36c8af3… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-10 (Fri, 10 Aug 2018) Changed paths: M test/api/test_workflows.py M test/base/data/test_workflow_with_runtime_input.ga M tools/filters/random_lines_two_pass.py M tools/filters/randomlines.xml Log Message: ----------- Make random_lines1 consistent on py2 and py3 (again) Turns out integers are used as is in `random.seed()`, but strings are hashed (in the version 1 protocol), and the hashing isn't stable. So instead we hack around this by using `ord()` on each character and concatenating the digits. Yucky, but probably better than using numpy and putting this tool on the list of tools that inherit galaxy's environment (or adding a requirement tag and resolving with conda ...). Commit: b2fed75059767aece3c0a75c630c9f30e31f0078 https://github.com/galaxyproject/galaxy/commit/b2fed75059767aece3c0a75c630c… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-11 (Sat, 11 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Flip testing image back to galaxy namespace Commit: ae3d41924ac844d22c454fbd01d49a9ac3ee3b74 https://github.com/galaxyproject/galaxy/commit/ae3d41924ac844d22c454fbd01d4… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/util/encoding_util.py Log Message: ----------- py3: Fix repository installation I'm very surprised this actually worked. I suppose we called my system's `hg` ?! Commit: 4d5ea3d724cf1a7fac1c6a2f9eeac133c47c2a06 https://github.com/galaxyproject/galaxy/commit/4d5ea3d724cf1a7fac1c6a2f9eea… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: A .ci/jenkins/integration-py3/run_tests.sh M run_tests.sh Log Message: ----------- Start testing integration tests on python 3 Commit: b47c246e0c688be2f9474c36e1d12b786deb2ac0 https://github.com/galaxyproject/galaxy/commit/b47c246e0c688be2f9474c36e1d1… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/datatypes/data.py Log Message: ----------- Fix showing, creating and downloading HTML files Commit: 37b5120197d8a8bf39b52585408998252e601d82 https://github.com/galaxyproject/galaxy/commit/37b5120197d8a8bf39b525854089… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/tools/data/__init__.py M lib/galaxy/util/renamed_temporary_file.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/tools/data_manager.py M test/integration/test_data_manager_table_reload.py M test/integration/tool_sheds_conf.xml M test/integration/uses_shed.py Log Message: ----------- py3: fix installing and running data managers Commit: 167e0e912907821943bd93eab2c0986a3d31136c https://github.com/galaxyproject/galaxy/commit/167e0e912907821943bd93eab2c0… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/tools/verify/interactor.py Log Message: ----------- Fix dictify_outputs The hack of setting `.__len` doesn't work on python 3. Subclassing OrderedDict and providing list-like access using integers should have the same effect. Commit: 14b1e1acd4eedce4a86b96094a496cbb76dd4239 https://github.com/galaxyproject/galaxy/commit/14b1e1acd4eedce4a86b96094a49… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/util/none_like.py Log Message: ----------- py3: Fix optional dataset bool value This fixes cheetah like `#if $input.dataset: ... #end if`. Which is a little weird, but fastqc uses this pattern. Commit: 344f68ea6d9c48a2a6f9dd56dd434633167d8f8e https://github.com/galaxyproject/galaxy/commit/344f68ea6d9c48a2a6f9dd56dd43… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/web/stack/__init__.py M lib/galaxy/web/stack/transport.py M scripts/galaxy-main Log Message: ----------- py3: Fix uwsgi mule startup Commit: 0b30a94bbe34fb40eaf6fc97c816fcbe0586d078 https://github.com/galaxyproject/galaxy/commit/0b30a94bbe34fb40eaf6fc97c816… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/uploads.py Log Message: ----------- py3: Fix new direct API-backed uploads Commit: dc4a4b0eb5c9a07d9048e893b9fa48b43eb58c09 https://github.com/galaxyproject/galaxy/commit/dc4a4b0eb5c9a07d9048e893b9fa… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M scripts/secret_decoder_ring.py Log Message: ----------- py3: fix secret decoder script Commit: 293ce5a4720c7fc2ec26d44985750188e3762e6b https://github.com/galaxyproject/galaxy/commit/293ce5a4720c7fc2ec26d4498575… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M test/base/driver_util.py M test/integration/test_mules_as_job_handlers.py Log Message: ----------- py3: Fix mules test cases We're now just copying the current python path. Also the handler names have actually changed, I think this hasn't been updated after a late change (it is now as it should be, based on the documentation). Commit: cfce2468451e52c72bf7f0544c1bc7e209cc9224 https://github.com/galaxyproject/galaxy/commit/cfce2468451e52c72bf7f0544c1b… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M test/integration/test_scripts.py Log Message: ----------- Fix GRT export test Commit: 620375c9d045e0085e2b260a97b3fdd5912fb45a https://github.com/galaxyproject/galaxy/commit/620375c9d045e0085e2b260a97b3… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M test/integration/test_mules_as_job_handlers.py Log Message: ----------- Do test mules on Jenkins, I don't see why this shouldn't work Commit: 6e7a66cdc0b9f467341af77d4d2fd5eadc9f409d https://github.com/galaxyproject/galaxy/commit/6e7a66cdc0b9f467341af77d4d2f… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py Log Message: ----------- Fix repository dependency manager Commit: dd7e4c601a3f31ce9c4fa06afc8234a39f0a5804 https://github.com/galaxyproject/galaxy/commit/dd7e4c601a3f31ce9c4fa06afc82… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M test/base/driver_util.py Log Message: ----------- Deal with docker localhost quirks Commit: fc06e78743086d3078d18e3928512cf62915bfb9 https://github.com/galaxyproject/galaxy/commit/fc06e78743086d3078d18e392851… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/datatypes/sequence.py Log Message: ----------- py3: Fix Maf datatype Commit: dfba132d11b0f6f6d15cb9fc8c79e0645640489e https://github.com/galaxyproject/galaxy/commit/dfba132d11b0f6f6d15cb9fc8c79… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/util/__init__.py Log Message: ----------- Fix stdout/stderr exception handling Commit: 853b2d03abcfe563b12c817db84d871fbc291725 https://github.com/galaxyproject/galaxy/commit/853b2d03abcfe563b12c817db84d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: A .ci/jenkins/api-py3/run_tests.sh A .ci/jenkins/integration-py3/run_tests.sh M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/dependencies/pipfiles/develop/Pipfile M lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/model/custom_types.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/verify/interactor.py M lib/galaxy/util/__init__.py M lib/galaxy/util/none_like.py M lib/galaxy/util/renamed_temporary_file.py M lib/galaxy/web/framework/middleware/batch.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/web/stack/transport.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/uploads.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/galaxy_install/tools/data_manager.py M lib/tool_shed/util/encoding_util.py A pytest.ini M run_tests.sh M scripts/galaxy-main M scripts/plugin_staging.py M scripts/secret_decoder_ring.py M test/api/test_workflows.py M test/base/data/test_workflow_with_runtime_input.ga M test/base/driver_util.py M test/base/populators.py M test/base/rules_test_data.py M test/docker/base/Dockerfile M test/docker/base/run_test_wrapper.sh M test/integration/test_data_manager_table_reload.py M test/integration/test_mules_as_job_handlers.py M test/integration/test_scripts.py M test/integration/tool_sheds_conf.xml M test/integration/uses_shed.py M tools/filters/random_lines_two_pass.py M tools/filters/randomlines.xml Log Message: ----------- Merge pull request #6565 from mvdbeek/setup_py3_test_job Setup py3 test job Compare: https://github.com/galaxyproject/galaxy/compare/164a7d7f04be...853b2d03abcf **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0