From 07b31492267aa29de026a8e714690806c7b6c1b3 Mon Sep 17 00:00:00 2001 From: Lei Wang Date: Wed, 8 Nov 2023 16:37:26 -0500 Subject: [PATCH] merge conflict 2.7.0 --- compute_endpoint/globus_compute_endpoint/version.py | 2 +- compute_endpoint/setup.py | 2 +- compute_sdk/globus_compute_sdk/version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compute_endpoint/globus_compute_endpoint/version.py b/compute_endpoint/globus_compute_endpoint/version.py index 15cf5575d..1f26823a3 100644 --- a/compute_endpoint/globus_compute_endpoint/version.py +++ b/compute_endpoint/globus_compute_endpoint/version.py @@ -1,6 +1,6 @@ # single source of truth for package version, # see https://packaging.python.org/en/latest/single_source_version/ -__version__ = "2.7.1" +__version__ = "2.7.0" # TODO: remove after a `globus-compute-sdk` release # this is needed because it's imported by `globus-compute-sdk` to do the version check diff --git a/compute_endpoint/setup.py b/compute_endpoint/setup.py index 396ada360..9b52a9d37 100644 --- a/compute_endpoint/setup.py +++ b/compute_endpoint/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "requests>=2.31.0,<3", "globus-sdk", # version will be bounded by `globus-compute-sdk` - "globus-compute-sdk==2.7.1", + "globus-compute-sdk==2.7.0", "globus-compute-common==0.3.0", "globus-identity-mapping==0.1.0", # table printing used in list-endpoints diff --git a/compute_sdk/globus_compute_sdk/version.py b/compute_sdk/globus_compute_sdk/version.py index 1b2a68bfe..ca01db1c3 100644 --- a/compute_sdk/globus_compute_sdk/version.py +++ b/compute_sdk/globus_compute_sdk/version.py @@ -3,7 +3,7 @@ # single source of truth for package version, # see https://packaging.python.org/en/latest/single_source_version/ -__version__ = "2.7.1" +__version__ = "2.7.0" def compare_versions(