| Previous changeset 138:1dba6c7687a9 (2021-04-14) Next changeset 140:7c8f9793127d (2021-04-17) |
|
Commit message:
Uploaded |
|
modified:
toolfactory/rgToolFactory2.py toolfactory/rgToolFactory2.xml |
| b |
| diff -r 1dba6c7687a9 -r 6b414af9ca11 toolfactory/rgToolFactory2.py --- a/toolfactory/rgToolFactory2.py Wed Apr 14 07:05:22 2021 +0000 +++ b/toolfactory/rgToolFactory2.py Sat Apr 17 05:02:01 2021 +0000 |
| [ |
| @@ -1058,6 +1058,8 @@ cll = [ "planemo", "test", + "--galaxy_python_version", + self.args.python_version, "--conda_auto_init", "--test_data", os.path.abspath(self.testdir), @@ -1152,6 +1154,7 @@ a("--galaxy_venv", default="/galaxy_venv") a("--collection", action="append", default=[]) a("--include_tests", default=False, action="store_true") + a("--python_version", default="3.9") args = parser.parse_args() assert not args.bad_user, ( 'UNAUTHORISED: %s is NOT authorized to use this tool until Galaxy \ |
| b |
| diff -r 1dba6c7687a9 -r 6b414af9ca11 toolfactory/rgToolFactory2.xml --- a/toolfactory/rgToolFactory2.xml Wed Apr 14 07:05:22 2021 +0000 +++ b/toolfactory/rgToolFactory2.xml Sat Apr 17 05:02:01 2021 +0000 |
| [ |
| @@ -179,6 +179,9 @@ </xml> </macros> +<!--<requirements> + <container type="docker"> quay.io/biocontainers/mulled-v2-a561fe5ac66db40ea5722f302d4555ea221ab3ec:1f00bdd160a9bd56118d529588d255e34b5efae2-0</container> +</requirements>--> <requirements> <requirement type="package" version="0.4.14">galaxyxml</requirement> <requirement type="package" version="0.15.0">bioblend</requirement> @@ -186,7 +189,7 @@ <requirement type="package" version="0.74.3">planemo</requirement> </requirements> - <command ><![CDATA[ +<command detect_errors="exit_code"><![CDATA[ #import os #set dev_env = os.environ.get('GALAXY_DEVELOPMENT_ENVIRONMENT', '0') == '1' #if not $dev_env and ( $__user_email__ not in $__admin_users__ ): |