Bump versions and changelog for release v2.26.0

globus · Aug 14, 2024 · 07cc670 · 07cc670
1 parent feb09d8
commit 07cc670
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/changelog.d/20240807_114300_30907815+rjmello_HEAD.rst b/changelog.d/20240807_114300_30907815+rjmello_HEAD.rst
diff --git a/...elog.d/20240807_183559_30907815+rjmello_gcengine_with_k8s_provider_sc_33870.rst b/...elog.d/20240807_183559_30907815+rjmello_gcengine_with_k8s_provider_sc_33870.rst
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.26.0a1"
+__version__ = "2.26.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.26.0a1",
+ "globus-compute-sdk==2.26.0",
  "globus-compute-common==0.4.1",
  "globus-identity-mapping==0.3.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.26.0a1"
+__version__ = "2.26.0"
 
 
 def compare_versions(

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,6 +3,24 @@ Changelog
 
 .. scriv-insert-here
 
+.. _changelog-2.26.0:
+
+globus-compute-sdk & globus-compute-endpoint v2.26.0
+----------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+- The endpoint CLI will now raise an error if the endpoint configuration includes
+ both the ``container_uri`` field and a provider that manages containers internally
+ (``AWSProvider``, ``GoogleCloudProvider``, or ``KubernetesProvider``). This prevents
+ conflicts in container management.
+
+Changed
+^^^^^^^
+
+- Bumped ``parsl`` dependency version to 2024.8.12.
+
 .. _changelog-2.25.0:
 
 globus-compute-sdk & globus-compute-endpoint v2.25.0