From 07cc670ba008466709c7da511a7ef8a6022cf851 Mon Sep 17 00:00:00 2001
From: Reid Mello <30907815+rjmello@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:51:24 -0400
Subject: [PATCH] Bump versions and changelog for release v2.26.0

---
 .../20240807_114300_30907815+rjmello_HEAD.rst  |  4 ----
 ...llo_gcengine_with_k8s_provider_sc_33870.rst |  7 -------
 .../globus_compute_endpoint/version.py         |  2 +-
 compute_endpoint/setup.py                      |  2 +-
 compute_sdk/globus_compute_sdk/version.py      |  2 +-
 docs/changelog.rst                             | 18 ++++++++++++++++++
 6 files changed, 21 insertions(+), 14 deletions(-)
 delete mode 100644 changelog.d/20240807_114300_30907815+rjmello_HEAD.rst
 delete mode 100644 changelog.d/20240807_183559_30907815+rjmello_gcengine_with_k8s_provider_sc_33870.rst

diff --git a/changelog.d/20240807_114300_30907815+rjmello_HEAD.rst b/changelog.d/20240807_114300_30907815+rjmello_HEAD.rst
deleted file mode 100644
index 7b8f556ec..000000000
--- a/changelog.d/20240807_114300_30907815+rjmello_HEAD.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Changed
-^^^^^^^
-
-- Bumped ``parsl`` dependency version to 2024.8.5.
diff --git a/changelog.d/20240807_183559_30907815+rjmello_gcengine_with_k8s_provider_sc_33870.rst b/changelog.d/20240807_183559_30907815+rjmello_gcengine_with_k8s_provider_sc_33870.rst
deleted file mode 100644
index 7251a41b5..000000000
--- a/changelog.d/20240807_183559_30907815+rjmello_gcengine_with_k8s_provider_sc_33870.rst
+++ /dev/null
@@ -1,7 +0,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.
\ No newline at end of file
diff --git a/compute_endpoint/globus_compute_endpoint/version.py b/compute_endpoint/globus_compute_endpoint/version.py
index f9d79b6ef..83d3f220b 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.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
index 09971c32c..3139ca88f 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.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
index a81a3338e..2c41f51e2 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.26.0a1"
+__version__ = "2.26.0"
 
 
 def compare_versions(
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 22a21ca0b..c9c8299b7 100644
--- 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