merge conflict 2.7.0

globus · Nov 8, 2023 · 07b3149 · 07b3149
1 parent 1ee6f71
commit 07b3149
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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(