From 205bc92ccfcb8bb15c8e8b32cc7d8de47045e9cc Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 28 Jan 2025 12:54:57 -0500
Subject: [PATCH 1/3] build: Add presubmits for Python 3.14 pre-release (#532)

---
 .github/sync-repo-settings.yaml | 6 ++++--
 .github/workflows/tests.yml     | 6 ++++--
 noxfile.py                      | 1 +
 testing/constraints-3.14.txt    | 0
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 testing/constraints-3.14.txt

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 2f30ae78..e0e29f08 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -27,8 +27,10 @@ branchProtectionRules:
     - 'unit (3.12, upb)'
     - 'unit (3.13, python)'
     - 'unit (3.13, upb)'
-    - 'prerelease (3.13, python)'
-    - 'prerelease (3.13, upb)'
+    - 'unit (3.14, python)'
+    - 'unit (3.14, upb)'
+    - 'prerelease (3.14, python)'
+    - 'prerelease (3.14, upb)'
     - cover
     - OwlBot Post Processor
     - 'cla/google'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 472f703f..77bfc9ad 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -45,7 +45,7 @@ jobs:
         # See https://github.com/actions/setup-python?tab=readme-ov-file#basic-usage
         # for the format of the entries in 'python'.
         # See https://downloads.python.org/pypy/ for the current supported versions of PyPy.
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy3.10']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', 'pypy3.10']
         variant: ['cpp', 'python', 'upb']
         # TODO(https://github.com/googleapis/proto-plus-python/issues/389):
         # Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
@@ -59,6 +59,8 @@ jobs:
             python: 3.12
           - variant: "cpp"
             python: 3.13
+          - variant: "cpp"
+            python: 3.14
             # In PyPy 3.10, we see the following warning
             # UserWarning: Selected implementation upb is not available. Falling back to the python implementation.
           - variant: "upb"
@@ -92,7 +94,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python: ['3.13']
+        python: ['3.14']
         variant: ['python', 'upb']
     steps:
       - uses: actions/checkout@v4
diff --git a/noxfile.py b/noxfile.py
index 01a65b09..1e43d826 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -30,6 +30,7 @@
     "3.11",
     "3.12",
     "3.13",
+    "3.14",
 ]
 
 # Error if a python version is missing
diff --git a/testing/constraints-3.14.txt b/testing/constraints-3.14.txt
new file mode 100644
index 00000000..e69de29b

From 51ba02513c4fa12fe94db74c4a23fed7af972ea9 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 5 Mar 2025 16:41:29 -0500
Subject: [PATCH 2/3] fix(deps): allow protobuf 6.x (#536)

* fix(deps): allow protobuf 6.x

* Remove 'dev'
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6fb7cbe2..3a031d66 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,7 @@ classifiers = [
   "Topic :: Software Development :: Code Generators",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-dependencies = ["protobuf >=3.19.0, < 6.0.0dev"]
+dependencies = ["protobuf >=3.19.0, < 7.0.0"]
 dynamic = ["version"]
 
 [project.urls]

From cab1d85db2168d7f8db7a10e9580cbf9e99f4ded Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 20:47:54 +0500
Subject: [PATCH 3/3] chore(main): release 1.26.1 (#538)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md     | 7 +++++++
 proto/version.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca736789..c0dea7c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.26.1](https://github.com/googleapis/proto-plus-python/compare/v1.26.0...v1.26.1) (2025-03-05)
+
+
+### Bug Fixes
+
+* **deps:** Allow protobuf 6.x ([#536](https://github.com/googleapis/proto-plus-python/issues/536)) ([51ba025](https://github.com/googleapis/proto-plus-python/commit/51ba02513c4fa12fe94db74c4a23fed7af972ea9))
+
 ## [1.26.0](https://github.com/googleapis/proto-plus-python/compare/v1.25.0...v1.26.0) (2025-01-22)
 
 
diff --git a/proto/version.py b/proto/version.py
index 0c2c9d92..46d6b35e 100644
--- a/proto/version.py
+++ b/proto/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.26.0"
+__version__ = "1.26.1"