From e9f2b3a051ae98fa7b14531b7425fc16635c0ca8 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Tue, 23 Feb 2021 10:52:43 +0100 Subject: [PATCH 01/15] always mount a job tmp rw --- lib/galaxy/tool_util/deps/container_classes.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/tool_util/deps/container_classes.py b/lib/galaxy/tool_util/deps/container_classes.py index c7c86e4e2a1..67263bc76c0 100644 --- a/lib/galaxy/tool_util/deps/container_classes.py +++ b/lib/galaxy/tool_util/deps/container_classes.py @@ -200,7 +200,6 @@ class HasDockerLikeVolumes: add_var("library_import_dir", self.app_info.library_import_dir) add_var('tool_data_path', self.app_info.tool_data_path) add_var('shed_tool_data_path', self.app_info.shed_tool_data_path) - if self.job_info.job_directory and self.job_info.job_directory_type == "pulsar": # We have a Pulsar job directory, so everything needed (excluding index # files) should be available in job_directory... @@ -248,7 +247,6 @@ class HasDockerLikeVolumes: if end_index < 0: end_index = len(volumes_str) volumes_str = volumes_str[0:tool_directory_index] + volumes_str[end_index:len(volumes_str)] - return volumes_str @@ -299,8 +297,9 @@ class DockerContainer(Container, HasDockerLikeVolumes): # and Galaxy. if self.job_info.tmp_directory is not None: volumes.append(DockerVolume.from_str("%s:/tmp:rw" % self.job_info.tmp_directory)) + else: + volumes.append(DockerVolume.from_str("$_GALAXY_JOB_TMP_DIR:$_GALAXY_JOB_TMP_DIR:rw")) volumes_from = self.destination_info.get("docker_volumes_from", docker_util.DEFAULT_VOLUMES_FROM) - docker_host_props = self.docker_host_props cached_image_file = self.__get_cached_image_file() From 742bae057c86e4f3219a8d4a93c7adbaf99e6ac0 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Tue, 23 Feb 2021 11:23:30 +0100 Subject: [PATCH 02/15] test writing to job home and tmp --- .../tools/job_environment_default.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/test/functional/tools/job_environment_default.xml b/test/functional/tools/job_environment_default.xml index 61604b73e03..3d3f6360f30 100644 --- a/test/functional/tools/job_environment_default.xml +++ b/test/functional/tools/job_environment_default.xml @@ -3,14 +3,16 @@ busybox:ubuntu-14.04 &2 echo 'Example tool stderr output.'); - echo `id -u` > '$user_id'; - echo `id -g` > '$group_id'; - echo `pwd` > '$pwd'; - echo "\$HOME" > '$home'; - echo "\$TMP" > '$tmp'; - echo "\$SOME_ENV_VAR" > '$some_env_var'; + echo 'Writing environment properties to output files.' && + (>&2 echo 'Example tool stderr output.') && + echo `id -u` > '$user_id' && + echo `id -g` > '$group_id' && + echo `pwd` > '$pwd' && + echo "\$HOME" > '$home' && + echo "\$TMP" > '$tmp' && + echo "\$SOME_ENV_VAR" > '$some_env_var' && + touch '\$_GALAXY_JOB_TMP_DIR/test' && + touch '\$_GALAXY_JOB_HOME_DIR/test ]]> From 21a58376775d1e001da4f3849b8ffca28a286164 Mon Sep 17 00:00:00 2001 From: M Bernt Date: Tue, 23 Feb 2021 18:28:55 +0100 Subject: [PATCH 03/15] fix quoting Co-authored-by: Marius van den Beek --- test/functional/tools/job_environment_default.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/functional/tools/job_environment_default.xml b/test/functional/tools/job_environment_default.xml index 3d3f6360f30..c20e17016a5 100644 --- a/test/functional/tools/job_environment_default.xml +++ b/test/functional/tools/job_environment_default.xml @@ -3,6 +3,7 @@ busybox:ubuntu-14.04 &2 echo 'Example tool stderr output.') && echo `id -u` > '$user_id' && @@ -13,6 +14,19 @@ echo "\$SOME_ENV_VAR" > '$some_env_var' && touch '\$_GALAXY_JOB_TMP_DIR/test' && touch '\$_GALAXY_JOB_HOME_DIR/test +======= +echo 'Writing environment properties to output files.' && +(>&2 echo 'Example tool stderr output.') && +echo \$(id -u) > '$user_id' && +echo \$(id -g) > '$group_id' && +echo \$(pwd) > '$pwd' && +echo "\$HOME" > '$home' && +echo "\$TMP" > '$tmp' && +echo "\$SOME_ENV_VAR" > '$some_env_var' && +## test if job home and tmp are mounted rw +touch "\$_GALAXY_JOB_TMP_DIR/test" && +touch "\$_GALAXY_JOB_HOME_DIR/test" +>>>>>>> 75b43147fe... fix quoting ]]> From 95f7383e19a1c211584905a980082aacd104a057 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Fri, 27 Nov 2020 17:10:19 +0100 Subject: [PATCH 04/15] export _GALAXY_JOB_HOME_DIR and _GALAXY_JOB_TMP_DIR these two variables are available in containers because of `docker run ...-e "_GALAXY_JOB_HOME_DIR=$_GALAXY_JOB_HOME_DIR" -e "_GALAXY_JOB_TMP_DIR=$_GALAXY_JOB_TMP_DIR"` but since they are not exported the same does not hold for non containerised jobs. Also moved `export GALAXY_SLOTS` to CLUSTER_SLOTS_STATEMENT.sh. Unsure if this export should be changed to something more complex as in MEMORY_STATEMENT.sh. --- lib/galaxy/jobs/runners/condor.py | 4 ++-- .../jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh | 1 + .../jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/jobs/runners/condor.py b/lib/galaxy/jobs/runners/condor.py index e59e6952ded..c769412eaf3 100644 --- a/lib/galaxy/jobs/runners/condor.py +++ b/lib/galaxy/jobs/runners/condor.py @@ -98,9 +98,9 @@ class CondorJobRunner(AsynchronousJobRunner): galaxy_slots = query_params.get('request_cpus', None) if galaxy_slots: - galaxy_slots_statement = 'GALAXY_SLOTS="%s"; export GALAXY_SLOTS_CONFIGURED="1"' % galaxy_slots + galaxy_slots_statement = 'GALAXY_SLOTS="%s"; export GALAXY_SLOTS; GALAXY_SLOTS_CONFIGURED="1"; export GALAXY_SLOTS_CONFIGURED;' % galaxy_slots else: - galaxy_slots_statement = 'GALAXY_SLOTS="1"' + galaxy_slots_statement = 'GALAXY_SLOTS="1"; export GALAXY_SLOTS;' # define job attributes cjs = CondorJobState( diff --git a/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh b/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh index 01dccf22c5d..06e0cbc0adb 100644 --- a/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh +++ b/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh @@ -30,3 +30,4 @@ else GALAXY_SLOTS="1" unset GALAXY_SLOTS_CONFIGURED fi +export GALAXY_SLOTS diff --git a/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh b/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh index 471682827c5..065b1cb7ba1 100644 --- a/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh +++ b/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh @@ -27,13 +27,14 @@ _galaxy_setup_environment() { $integrity_injection $slots_statement -export GALAXY_SLOTS export PYTHONWARNINGS="ignore" GALAXY_VIRTUAL_ENV="$galaxy_virtual_env" _GALAXY_VIRTUAL_ENV="$galaxy_virtual_env" PRESERVE_GALAXY_ENVIRONMENT="$preserve_python_environment" GALAXY_LIB="$galaxy_lib" _galaxy_setup_environment "$PRESERVE_GALAXY_ENVIRONMENT" +export _GALAXY_JOB_HOME_DIR +export _GALAXY_JOB_TMP_DIR GALAXY_PYTHON=`command -v python` cd $working_directory $memory_statement From a2a83286cdab507c6fc009d2fa8e7f52ddcdc974 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Fri, 27 Nov 2020 19:12:42 +0100 Subject: [PATCH 05/15] add docs to xsd --- lib/galaxy/tool_util/xsd/galaxy.xsd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd index 55e26ed8250..328841f3811 100644 --- a/lib/galaxy/tool_util/xsd/galaxy.xsd +++ b/lib/galaxy/tool_util/xsd/galaxy.xsd @@ -2865,6 +2865,8 @@ Name | Description ``\${GALAXY_SLOTS:-4}`` | Number of cores/threads allocated by the job runner or resource manager to the tool for the given job (here 4 is the default number of threads to use if running via custom runner that does not configure GALAXY_SLOTS or in an older Galaxy runtime). ``\$GALAXY_MEMORY_MB`` | Total amount of memory in megabytes (1024^2 bytes) allocated by the administrator (via the resource manager) to the tool for the given job. If unset, tools should not attempt to limit memory usage. ``\$GALAXY_MEMORY_MB_PER_SLOT`` | Amount of memory per slot in megabytes (1024^2 bytes) allocated by the administrator (via the resource manager) to the tool for the given job. If unset, tools should not attempt to limit memory usage. +``\$_GALAXY_JOB_HOME_DIR`` | Path to an empty directory in the job's woring directory that can be used as a home directory. +``\$_GALAXY_JOB_TMP_DIR`` | Path to an empty directory in the job's woring directory that can be used as a temporary directory. See the [Planemo docs](https://planemo.readthedocs.io/en/latest/writing_advanced.html#cluster-usage) on the topic of ``GALAXY_SLOTS`` for more information and examples. From 22e7b985f76bc3ccfa7343a4c9a4ed8d886dd68a Mon Sep 17 00:00:00 2001 From: M Bernt Date: Tue, 23 Feb 2021 13:18:34 +0100 Subject: [PATCH 06/15] Remove doc of _GALAXY_JOB_HOME_DIR Co-authored-by: Nicola Soranzo --- lib/galaxy/tool_util/xsd/galaxy.xsd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd index 328841f3811..10542bd9e15 100644 --- a/lib/galaxy/tool_util/xsd/galaxy.xsd +++ b/lib/galaxy/tool_util/xsd/galaxy.xsd @@ -2865,8 +2865,7 @@ Name | Description ``\${GALAXY_SLOTS:-4}`` | Number of cores/threads allocated by the job runner or resource manager to the tool for the given job (here 4 is the default number of threads to use if running via custom runner that does not configure GALAXY_SLOTS or in an older Galaxy runtime). ``\$GALAXY_MEMORY_MB`` | Total amount of memory in megabytes (1024^2 bytes) allocated by the administrator (via the resource manager) to the tool for the given job. If unset, tools should not attempt to limit memory usage. ``\$GALAXY_MEMORY_MB_PER_SLOT`` | Amount of memory per slot in megabytes (1024^2 bytes) allocated by the administrator (via the resource manager) to the tool for the given job. If unset, tools should not attempt to limit memory usage. -``\$_GALAXY_JOB_HOME_DIR`` | Path to an empty directory in the job's woring directory that can be used as a home directory. -``\$_GALAXY_JOB_TMP_DIR`` | Path to an empty directory in the job's woring directory that can be used as a temporary directory. +``\$_GALAXY_JOB_TMP_DIR`` | Path to an empty directory in the job's working directory that can be used as a temporary directory. See the [Planemo docs](https://planemo.readthedocs.io/en/latest/writing_advanced.html#cluster-usage) on the topic of ``GALAXY_SLOTS`` for more information and examples. From 7aa833dc70508f41ec5ebfaa1e5c305d2574e910 Mon Sep 17 00:00:00 2001 From: M Bernt Date: Tue, 23 Feb 2021 13:19:06 +0100 Subject: [PATCH 07/15] Remove superficial export of _GALAXY_JOB_HOME_DIR Co-authored-by: Nicola Soranzo --- .../jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh b/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh index 065b1cb7ba1..31d4b2245a0 100644 --- a/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh +++ b/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh @@ -33,7 +33,6 @@ _GALAXY_VIRTUAL_ENV="$galaxy_virtual_env" PRESERVE_GALAXY_ENVIRONMENT="$preserve_python_environment" GALAXY_LIB="$galaxy_lib" _galaxy_setup_environment "$PRESERVE_GALAXY_ENVIRONMENT" -export _GALAXY_JOB_HOME_DIR export _GALAXY_JOB_TMP_DIR GALAXY_PYTHON=`command -v python` cd $working_directory From 11b7b369c4afbfd2661ccf4fcf81bcb9c4b174f0 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Wed, 24 Feb 2021 13:09:59 +0100 Subject: [PATCH 08/15] simplify debugging --- .../tools/job_environment_default.xml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/test/functional/tools/job_environment_default.xml b/test/functional/tools/job_environment_default.xml index c20e17016a5..7493fdf46e4 100644 --- a/test/functional/tools/job_environment_default.xml +++ b/test/functional/tools/job_environment_default.xml @@ -3,7 +3,6 @@ busybox:ubuntu-14.04 &2 echo 'Example tool stderr output.') && echo `id -u` > '$user_id' && @@ -12,21 +11,8 @@ echo "\$HOME" > '$home' && echo "\$TMP" > '$tmp' && echo "\$SOME_ENV_VAR" > '$some_env_var' && - touch '\$_GALAXY_JOB_TMP_DIR/test' && - touch '\$_GALAXY_JOB_HOME_DIR/test -======= -echo 'Writing environment properties to output files.' && -(>&2 echo 'Example tool stderr output.') && -echo \$(id -u) > '$user_id' && -echo \$(id -g) > '$group_id' && -echo \$(pwd) > '$pwd' && -echo "\$HOME" > '$home' && -echo "\$TMP" > '$tmp' && -echo "\$SOME_ENV_VAR" > '$some_env_var' && -## test if job home and tmp are mounted rw -touch "\$_GALAXY_JOB_TMP_DIR/test" && -touch "\$_GALAXY_JOB_HOME_DIR/test" ->>>>>>> 75b43147fe... fix quoting + touch "\$_GALAXY_JOB_TMP_DIR/tmp_test" && + touch "\$_GALAXY_JOB_HOME_DIR/home_test" ]]> From 4ce12fd4088595cc87edf9f7473a04474fbe213f Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Wed, 24 Feb 2021 21:27:59 +0100 Subject: [PATCH 09/15] Revert "Remove superficial export of _GALAXY_JOB_HOME_DIR" This reverts commit 365fb066b0d8c86f4d45a3e626969756506c315a. --- .../jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh b/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh index 31d4b2245a0..065b1cb7ba1 100644 --- a/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh +++ b/lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh @@ -33,6 +33,7 @@ _GALAXY_VIRTUAL_ENV="$galaxy_virtual_env" PRESERVE_GALAXY_ENVIRONMENT="$preserve_python_environment" GALAXY_LIB="$galaxy_lib" _galaxy_setup_environment "$PRESERVE_GALAXY_ENVIRONMENT" +export _GALAXY_JOB_HOME_DIR export _GALAXY_JOB_TMP_DIR GALAXY_PYTHON=`command -v python` cd $working_directory From 03b7ca05d846ba78865e121c6ba4665819faf88d Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Wed, 24 Feb 2021 21:46:20 +0100 Subject: [PATCH 10/15] fix unit test the export of GALAXY_SLOTS is now part of the slots_statement --- lib/galaxy/jobs/runners/util/job_script/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/jobs/runners/util/job_script/__init__.py b/lib/galaxy/jobs/runners/util/job_script/__init__.py index 555ecb8d746..e318d117b32 100644 --- a/lib/galaxy/jobs/runners/util/job_script/__init__.py +++ b/lib/galaxy/jobs/runners/util/job_script/__init__.py @@ -79,7 +79,7 @@ def job_script(template=DEFAULT_JOB_FILE_TEMPLATE, **kwds): >>> script.startswith('#!/bin/bash\\n\\n#PBS -test\\n') True >>> script = job_script(working_directory='wd', command='uptime', exit_code_path='ec', slots_statement='GALAXY_SLOTS="$SLURM_JOB_NUM_NODES"') - >>> script.find('GALAXY_SLOTS="$SLURM_JOB_NUM_NODES"\\nexport GALAXY_SLOTS\\n') > 0 + >>> script.find('GALAXY_SLOTS="$SLURM_JOB_NUM_NODES"\\n') > 0 True >>> script = job_script(working_directory='wd', command='uptime', exit_code_path='ec', memory_statement='GALAXY_MEMORY_MB="32768"') >>> script.find('GALAXY_MEMORY_MB="32768"\\n') > 0 From 8708e011cfdeda0fe0e7756830ed6acf5c425180 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Thu, 25 Feb 2021 11:46:08 +0100 Subject: [PATCH 11/15] create a test file in $HOME --- test/functional/tools/job_environment_default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/tools/job_environment_default.xml b/test/functional/tools/job_environment_default.xml index 7493fdf46e4..6585fc79cfd 100644 --- a/test/functional/tools/job_environment_default.xml +++ b/test/functional/tools/job_environment_default.xml @@ -12,7 +12,7 @@ echo "\$TMP" > '$tmp' && echo "\$SOME_ENV_VAR" > '$some_env_var' && touch "\$_GALAXY_JOB_TMP_DIR/tmp_test" && - touch "\$_GALAXY_JOB_HOME_DIR/home_test" + touch "\$HOME/home_test" ]]> From 5c2ef80c6bf60e9e01027e31324057f239bcbb29 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Thu, 25 Feb 2021 11:45:02 +0100 Subject: [PATCH 12/15] fix chained dynamic destinations integration test - create a tmp dir as absolute path - actually create a dir in the dyndest test --- test/integration/chained_dyndest_rules/module3/rules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/chained_dyndest_rules/module3/rules.py b/test/integration/chained_dyndest_rules/module3/rules.py index 72b3f9b68f5..61fd78aba41 100644 --- a/test/integration/chained_dyndest_rules/module3/rules.py +++ b/test/integration/chained_dyndest_rules/module3/rules.py @@ -14,6 +14,6 @@ def dyndest_chain_2(): def dyndest_chain_3(tmp_dir_prefix_two): - tmp_dir = '$(mktemp %sand3XXXXXXXXXXXX)' % tmp_dir_prefix_two + tmp_dir = '$(mktemp -d -p $(pwd) %sand3XXXXXXXXXXXX)' % tmp_dir_prefix_two return JobDestination(runner="local", params={'tmp_dir': tmp_dir}) From 241977854f284524bd368571c53f2b2db684892e Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Thu, 25 Feb 2021 13:49:58 +0100 Subject: [PATCH 13/15] Fix another integration test TmpDirAsShellCommandJobEnvironmentIntegrationTestCase.test_default_environment_1801 - actually create a dir - create the dir in the job working dir --- test/integration/sets_tmp_dir_expression_job_conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/sets_tmp_dir_expression_job_conf.xml b/test/integration/sets_tmp_dir_expression_job_conf.xml index b4be01bda77..ca5de21f526 100644 --- a/test/integration/sets_tmp_dir_expression_job_conf.xml +++ b/test/integration/sets_tmp_dir_expression_job_conf.xml @@ -6,7 +6,7 @@ - $(mktemp cooltmpXXXXXXXXXXXX) + $(mktemp -d -p $(pwd) cooltmpXXXXXXXXXXXX) From 0fbbf734f5312be8e4661417c7b1d28bd111138c Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 1 Mar 2021 15:29:38 -0500 Subject: [PATCH 14/15] Version 20.9.1 of objectstore (tag galaxy-objectstore-20.9.1). --- packages/objectstore/HISTORY.rst | 2 +- packages/objectstore/galaxy/project_galaxy_objectstore.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/objectstore/HISTORY.rst b/packages/objectstore/HISTORY.rst index 08c9654f4a5..9ae89b6741e 100644 --- a/packages/objectstore/HISTORY.rst +++ b/packages/objectstore/HISTORY.rst @@ -6,7 +6,7 @@ History .. to_doc --------------------- -20.9.1.dev0 +20.9.1 (2021-03-01) --------------------- diff --git a/packages/objectstore/galaxy/project_galaxy_objectstore.py b/packages/objectstore/galaxy/project_galaxy_objectstore.py index 0ff5f53bfcf..827e02655ad 100644 --- a/packages/objectstore/galaxy/project_galaxy_objectstore.py +++ b/packages/objectstore/galaxy/project_galaxy_objectstore.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '20.9.1.dev0' +__version__ = '20.9.1' PROJECT_NAME = "galaxy-objectstore" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" From 373489e8f4fe8a583a3b5f0e15e9f327e2c7af89 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 1 Mar 2021 16:37:33 -0500 Subject: [PATCH 15/15] Starting work on objectstore 20.9.2 --- packages/objectstore/HISTORY.rst | 6 ++++++ packages/objectstore/galaxy/project_galaxy_objectstore.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/objectstore/HISTORY.rst b/packages/objectstore/HISTORY.rst index 9ae89b6741e..569ebced7b2 100644 --- a/packages/objectstore/HISTORY.rst +++ b/packages/objectstore/HISTORY.rst @@ -5,6 +5,12 @@ History .. to_doc +--------------------- +20.9.2.dev0 +--------------------- + + + --------------------- 20.9.1 (2021-03-01) --------------------- diff --git a/packages/objectstore/galaxy/project_galaxy_objectstore.py b/packages/objectstore/galaxy/project_galaxy_objectstore.py index 827e02655ad..093f385ec00 100644 --- a/packages/objectstore/galaxy/project_galaxy_objectstore.py +++ b/packages/objectstore/galaxy/project_galaxy_objectstore.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '20.9.1' +__version__ = '20.9.2.dev0' PROJECT_NAME = "galaxy-objectstore" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"