Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: cbcd3627f3833ada31b58863d5504666bb98b956 https://github.com/galaxyproject/galaxy/commit/cbcd3627f3833ada31b58863d5504... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/__init__.py M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Allow passing unused keywords to container resolver Commit: 8f8642aa33e4c25e9f3bdff28b37a334af97b89c https://github.com/galaxyproject/galaxy/commit/8f8642aa33e4c25e9f3bdff28b37a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge container resolver with high-level dependency manager Commit: b505fe37eac6b0331c20b26b7a0cddc49942a38a https://github.com/galaxyproject/galaxy/commit/b505fe37eac6b0331c20b26b7a0cd... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/resolvers/__init__.py Log Message: ----------- Introduce a ContainerDependency class Commit: 360e605be965be5c414ca9ead34c536dd4003fd9 https://github.com/galaxyproject/galaxy/commit/360e605be965be5c414ca9ead34c5... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Adjust _requirements_to_dependencies_dict to also report available containers in the manage dependencies menu Commit: 40d8a38108fca6c21efc72f66660b3a1a7c42caa https://github.com/galaxyproject/galaxy/commit/40d8a38108fca6c21efc72f66660b... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Augment NullDependency with version and always record incoming null dependencies, since the container resolvers don't return NullDependency objects. Commit: f2128692a4f42da2254a53b69cbf1931e74c10dc https://github.com/galaxyproject/galaxy/commit/f2128692a4f42da2254a53b69cbf1... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Fix matching single package mulled docker containers An image like `quay.io/biocontainers/ucsc-liftover:357--1` would otherwise have the package name `quay.io/biocontainers/ucsc-liftover` instead of `ucsc-liftover` Commit: fa6cca0224fd2b0239160df565a58507b05ac00f https://github.com/galaxyproject/galaxy/commit/fa6cca0224fd2b0239160df565a58... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/views.py Log Message: ----------- Only walk through enabled container resolvers Commit: 541f0ebf3d754f5a8eb4a3d8a56d0c197c29c5cb https://github.com/galaxyproject/galaxy/commit/541f0ebf3d754f5a8eb4a3d8a56d0... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/config.py M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/dependencies.py Log Message: ----------- Avoid circular imports by moving {App,Job,Tool} Info classes to dependencies.py Commit: 3b4b510ad01f48253587db1bcd87400237709673 https://github.com/galaxyproject/galaxy/commit/3b4b510ad01f48253587db1bcd874... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/__init__.py Log Message: ----------- Add `can_uninstall_dependencies` attribute to ContainerResolver Commit: a4f18d8f601c83826a451d63af2fa67d319f58a7 https://github.com/galaxyproject/galaxy/commit/a4f18d8f601c83826a451d63af2fa... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/config.py M lib/galaxy/tools/deps/__init__.py A lib/galaxy/tools/deps/container_classes.py M lib/galaxy/tools/deps/views.py Log Message: ----------- Make DependencyManager container & destination-aware This will allow us to use the proper parameters when pulling containers. Commit: 2d3ab4ce1205aec24664225d74b2a851cb94b2b0 https://github.com/galaxyproject/galaxy/commit/2d3ab4ce1205aec24664225d74b2a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Allow specifying resolver index and resolver_type when installing dependencies via tools API Commit: 7ca17e2b83d45e3c5a63643cc59785f6162803c5 https://github.com/galaxyproject/galaxy/commit/7ca17e2b83d45e3c5a63643cc5978... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Drop NullDependency only when not skipping resolver Commit: 59c56b8f563fd4298d37d40af0b0f429761c4392 https://github.com/galaxyproject/galaxy/commit/59c56b8f563fd4298d37d40af0b0f... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Mention index and resolver_type in API docstring Commit: 2aab490807245c30935389001605c170bbebbf98 https://github.com/galaxyproject/galaxy/commit/2aab490807245c30935389001605c... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_classes.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/dockerfiles.py Log Message: ----------- Move Container classes into container_classes to avoid circular imports Commit: 55f989c23650e94e1f28a3ac60d10931dfd70076 https://github.com/galaxyproject/galaxy/commit/55f989c23650e94e1f28a3ac60d10... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Make mulled docker containers installable Commit: 19bc4985c91c14295d7c2048355a0bf71d4ec1cd https://github.com/galaxyproject/galaxy/commit/19bc4985c91c14295d7c2048355a0... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Allow selecting resolver when uninstalling through tools API Commit: 50d8e3079d873fe4161149b00365cf0d5702eb56 https://github.com/galaxyproject/galaxy/commit/50d8e3079d873fe4161149b00365c... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M test/integration/test_resolvers.py Log Message: ----------- Add integration test for un/install with resolver_type Commit: 66a3f556abeb410fd59f1b408efae94f168699d8 https://github.com/galaxyproject/galaxy/commit/66a3f556abeb410fd59f1b408efae... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_classes.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/singularity_util.py Log Message: ----------- Use singularity build with biocontainers This makes it possible to pull a container from quay.io/biocontainers and to convert it to singularity format for later execution (via the CachedMulledSingularityContainerResolver). This is nicely integrated with the DependencyManager view, so you can (as for conda or docker) do: ``` requests.post(galaxy_url+'/api/tools/deseq2/dependencies', {'key': API_KEY, 'resolver_type': 'mulled_singularity'}) ``` This is quite lightweight, the resulting image is significantly smaller than the conda env (since it is compressed), and the install process is much faster. Commit: 1fcbd971c8aa743b3e035ddc27a4ea78e01bac0a https://github.com/galaxyproject/galaxy/commit/1fcbd971c8aa743b3e035ddc27a4e... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M config/container_resolvers_conf.xml.sample M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Try cached resolver before non-cached Commit: b41d969d681e3d427fd9f42ca9502c91634f061d https://github.com/galaxyproject/galaxy/commit/b41d969d681e3d427fd9f42ca9502... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/singularity_util.py A test/integration/singularity_job_conf.xml A test/integration/test_containerized_jobs.py R test/integration/test_dockerized_jobs.py Log Message: ----------- Add integration test for singularity resolution Commit: fd4b009089d226e05a6191c3067fad560c5a77c8 https://github.com/galaxyproject/galaxy/commit/fd4b009089d226e05a6191c3067fa... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M test/base/integration_util.py M test/integration/test_containerized_jobs.py Log Message: ----------- Skip singualrity integration tests if singularity not available Commit: 2d6863067554f38ac05625bee1b81663a7973a1a https://github.com/galaxyproject/galaxy/commit/2d6863067554f38ac05625bee1b81... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Add MulledSingularityContainerResolver to __all__ Otherwise speicifying the resolver in containers_conf.xml fails. Commit: 337bddfd4841d51291f940effc99a4622f10649a https://github.com/galaxyproject/galaxy/commit/337bddfd4841d51291f940effc99a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Pass in user, fixes dependency install for data manager tools Commit: 83473f075d9e8cce04dc775d37b44b87baca9931 https://github.com/galaxyproject/galaxy/commit/83473f075d9e8cce04dc775d37b44... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M test/docker/base/Dockerfile M test/docker/base/run_test_wrapper.sh R test/docker/base/start_mysql.sh Log Message: ----------- Update testing docker image; drop mysql tests, add singularity Commit: 6b25cace916de7a694b0e83ee640d7170c24cd10 https://github.com/galaxyproject/galaxy/commit/6b25cace916de7a694b0e83ee640d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Do run through build_mulled resolver if install is set Commit: 0d86c9098c032742b091d4691634ada81da980f0 https://github.com/galaxyproject/galaxy/commit/0d86c9098c032742b091d4691634a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Make NullDependencyManager a class with empty non-container dependencies Commit: 13592e5e85195cb0c457457fb1a350fa8df213d4 https://github.com/galaxyproject/galaxy/commit/13592e5e85195cb0c457457fb1a35... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Fix __str__ for BuildSingularityContainerResolver Commit: ccb8429a84e8d4a63f57e320510b5de2524eb5e6 https://github.com/galaxyproject/galaxy/commit/ccb8429a84e8d4a63f57e320510b5... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/mulled/mulled_build.py Log Message: ----------- Download a binary that works on OSX Commit: 4ef3460c041f210b0c0513a3786b186bac7a05e9 https://github.com/galaxyproject/galaxy/commit/4ef3460c041f210b0c0513a3786b1... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- DependencyManager lint fix Commit: ac5e7d994912b292fb3d3464e4e5e58859070bc9 https://github.com/galaxyproject/galaxy/commit/ac5e7d994912b292fb3d3464e4e5e... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/config.py M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Make `resolver` methods respect enabled_container_types Commit: 62863e8991728a1fe4b92cf42cd9d1e825ff1a02 https://github.com/galaxyproject/galaxy/commit/62863e8991728a1fe4b92cf42cd9d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/mulled/mulled_build.py Log Message: ----------- Don't fail if build exists and also don't remove build dir if it already exists Commit: 4a307ac5bea000d097e8488017f437e678a97a7f https://github.com/galaxyproject/galaxy/commit/4a307ac5bea000d097e8488017f43... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Add ExplicitSingularityContainerResolver Commit: a6a186a64251f206294f2fd3416fb08db4234f47 https://github.com/galaxyproject/galaxy/commit/a6a186a64251f206294f2fd3416fb... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/requirements.py Log Message: ----------- Make containers list, map can only be iterated once Commit: 44d73f72c8967b114114d662ddb42098514026ee https://github.com/galaxyproject/galaxy/commit/44d73f72c8967b114114d662ddb42... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M run_tests.sh M test/docker/base/Dockerfile M test/docker/base/run_test_wrapper.sh Log Message: ----------- Update Dockefile and run_test_wrapper.sh We use the Galaxy users' home dir for HOME. Otherwise os.environ.get('HOME') would return '/home/galaxy', but jobs run would see /galaxy. Commit: c0b63a18c7a2fa7d7fb45ffbddfcef5aa4c00c67 https://github.com/galaxyproject/galaxy/commit/c0b63a18c7a2fa7d7fb45ffbddfce... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M test/functional/tools/job_environment_default.xml M test/functional/tools/job_environment_default_legacy.xml M test/integration/test_containerized_jobs.py Log Message: ----------- Fix container integration tests Commit: a0bd7072adf7f03a82adfddf3216b15ce7105c87 https://github.com/galaxyproject/galaxy/commit/a0bd7072adf7f03a82adfddf3216b... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Use bash for mulled ContainerDescriptions The base mulled container contains bash, and unfortunately bashisms such as <(cat bla) are very common in widely used Galaxy wrappers. So I think it makes sense to default to bash here. Commit: 99a0ab03e90d2f9355c130403b1a0f5cb1ca5706 https://github.com/galaxyproject/galaxy/commit/99a0ab03e90d2f9355c130403b1a0... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M run_tests.sh Log Message: ----------- Temporarily test from mvdbeek/testing-base Commit: a056f1746069a38b43bd0cc62bbe12d96aaa5145 https://github.com/galaxyproject/galaxy/commit/a056f1746069a38b43bd0cc62bbe1... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M config/galaxy.yml.sample M doc/source/admin/galaxy_options.rst M lib/galaxy/config.py M lib/galaxy/tools/deps/dependencies.py M lib/galaxy/webapps/galaxy/config_schema.yml Log Message: ----------- Document and use mulled_channels option Commit: 93622f026bacef4328e2415aad72f521d92192c9 https://github.com/galaxyproject/galaxy/commit/93622f026bacef4328e2415aad72f... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Only parse build if build in name Otherwise this fails with ``` Traceback (most recent call last): File "lib/galaxy/web/framework/decorators.py", line 277, in decorator rval = func(self, trans, *args, **kwargs) File "lib/galaxy/web/framework/decorators.py", line 101, in decorator return func(self, trans, *args, **kwargs) File "lib/galaxy/webapps/galaxy/api/tools.py", line 239, in install_dependencies tool._view.install_dependencies(tool.requirements, **kwds) File "lib/galaxy/tools/deps/views.py", line 107, in install_dependencies return self._dependency_manager._requirements_to_dependencies_dict(requirements, **kwds) File "lib/galaxy/tools/deps/__init__.py", line 190, in _requirements_to_dependencies_dict **kwds) File "lib/galaxy/tools/deps/container_resolvers/mulled.py", line 343, in resolve name = targets_to_mulled_name(targets=targets, hash_func=self.hash_func, namespace=self.namespace) File "lib/galaxy/tools/deps/container_resolvers/mulled.py", line 278, in targets_to_mulled_name version, build = split_tag(tag) File "lib/galaxy/tools/deps/mulled/util.py", line 69, in split_tag build = tag.split('--', 1)[1] IndexError: list index out of range ``` if a single-target image was build with a build_mulled resolver. Commit: b3af5176d35b0a1e818975c263018fb7ea800bcd https://github.com/galaxyproject/galaxy/commit/b3af5176d35b0a1e818975c263018... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py Log Message: ----------- Replace deprecated singularity import with build And upgrade singularity build image to 2.4.6 (latest on biocontainers). Overall this is necessary because singularity import 2.3X doesn't work behind proxies. The change from `Singularity` to `Singularity.def` is necessary because the script uses the `file` command if the Singularity file doesn't end in .def or is not exactly Singularity (it is `/import/Singularity` in our case). `file` isn't available in the biocontainers image. Commit: 5f389dd11ea3da935b382871305bf0a7c1e2d3d4 https://github.com/galaxyproject/galaxy/commit/5f389dd11ea3da935b382871305bf... Author: Nicola Soranzo <nicola.soranzo@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M config/container_resolvers_conf.xml.sample M config/galaxy.yml.sample M doc/source/admin/galaxy_options.rst M lib/galaxy/webapps/galaxy/config_schema.yml Log Message: ----------- Fix spelling in resolver docs Co-Authored-By: mvdbeek <m.vandenbeek@gmail.com> Commit: 0343d3d87f438bdb669959bc5141030169cc01ba https://github.com/galaxyproject/galaxy/commit/0343d3d87f438bdb669959bc51410... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/mulled/util.py Log Message: ----------- Cache requests to mulled registry for 5 minutes When going through the resolvers we can easily exceed the allowed API request rate. Commit: 9051c10cba8360bc5a4ee199ff01657c3fda3b20 https://github.com/galaxyproject/galaxy/commit/9051c10cba8360bc5a4ee199ff016... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M run_tests.sh Log Message: ----------- More docker debug Commit: a03f8bdffd272e0195a6bf88931fb17b6e428d13 https://github.com/galaxyproject/galaxy/commit/a03f8bdffd272e0195a6bf88931fb... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M run_tests.sh M test/docker/base/run_test_wrapper.sh Log Message: ----------- Test singularity exec as Galaxy user Commit: 658816264a8e84bacfdf83e9c9029338b2e1f85d https://github.com/galaxyproject/galaxy/commit/658816264a8e84bacfdf83e9c9029... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/tools/deps/singularity_util.py Log Message: ----------- Explicitly pass home dir to singularity command Commit: 06f5abe1bc16eccf750baf7a754d48dfdedaaf5a https://github.com/galaxyproject/galaxy/commit/06f5abe1bc16eccf750baf7a754d4... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M test/docker/base/Dockerfile Log Message: ----------- Install singularity 3.0.1 from source Commit: bed8b54af604a2caf9161a5265953c90ae5a6c8a https://github.com/galaxyproject/galaxy/commit/bed8b54af604a2caf9161a5265953... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M .ci/jenkins/integration-py3/run_tests.sh M .ci/jenkins/integration/run_tests.sh M run_tests.sh M test/docker/base/run_test_wrapper.sh Log Message: ----------- Only run integration tests with --privileged Commit: 9517871b4af27c9647436d84ea2bfe76bb242ca8 https://github.com/galaxyproject/galaxy/commit/9517871b4af27c9647436d84ea2bf... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M run_tests.sh Log Message: ----------- Bump image to use Commit: 6b3af3b2ffa8d90946a6b2d9b803779df35e19fd https://github.com/galaxyproject/galaxy/commit/6b3af3b2ffa8d90946a6b2d9b8037... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/command_factory.py Log Message: ----------- Make dependency_shell_commands a property If we know we use a container we don't need to pass through the dependency resolver. Commit: 8a34101089085c6203cdd11468de4a0866922534 https://github.com/galaxyproject/galaxy/commit/8a34101089085c6203cdd11468de4... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2019-01-06 (Sun, 06 Jan 2019) Changed paths: M config/container_resolvers_conf.xml.sample M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- Introduce `auto_install` ContainerResolver flag If set to True (thats's the default), the container resolvers that can pull or build images will do that, if they are enabled. You can set this to `False` and instead pass through the DependencyManager to use these resolvers to pull or build images. Commit: 03b363a1ef92e696ba07050e2a4832c15c8a8964 https://github.com/galaxyproject/galaxy/commit/03b363a1ef92e696ba07050e2a483... Author: John Chilton <jmchilton@gmail.com> Date: 2019-01-07 (Mon, 07 Jan 2019) Changed paths: M .ci/jenkins/integration-py3/run_tests.sh M .ci/jenkins/integration/run_tests.sh M config/container_resolvers_conf.xml.sample M config/galaxy.yml.sample M doc/source/admin/galaxy_options.rst M lib/galaxy/config.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/deps/__init__.py A lib/galaxy/tools/deps/container_classes.py M lib/galaxy/tools/deps/container_resolvers/__init__.py M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/dependencies.py M lib/galaxy/tools/deps/dockerfiles.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/util.py M lib/galaxy/tools/deps/requirements.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/singularity_util.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/config_schema.yml M run_tests.sh M test/base/integration_util.py M test/docker/base/Dockerfile M test/docker/base/run_test_wrapper.sh R test/docker/base/start_mysql.sh M test/functional/tools/job_environment_default.xml M test/functional/tools/job_environment_default_legacy.xml A test/integration/singularity_job_conf.xml A test/integration/test_containerized_jobs.py R test/integration/test_dockerized_jobs.py M test/integration/test_resolvers.py Log Message: ----------- Merge pull request #7125 from mvdbeek/MulledSingularityContainerResolver Use singularity build / exec with biocontainers Compare: https://github.com/galaxyproject/galaxy/compare/952af6b6fde1...03b363a1ef92 **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.