From 240ae6fd46ab2752148136ce5855e5e975adc96b Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 24 Mar 2023 00:54:34 -0400
Subject: [PATCH] 23.1.0 version bump (#1196)

---
 .github/workflows/ci.yml | 2 +-
 CHANGELOG.rst            | 3 ++-
 setup.py                 | 2 +-
 src/OpenSSL/version.py   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a16af9036..e00ef74bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,8 @@ jobs:
           - {VERSION: "3.9", TOXENV: "py39"}
           - {VERSION: "3.10", TOXENV: "py310"}
           - {VERSION: "3.11", TOXENV: "py311"}
-          - {VERSION: "pypy-3.7", TOXENV: "pypy3"}
           - {VERSION: "pypy-3.8", TOXENV: "pypy3"}
+          - {VERSION: "pypy-3.9", TOXENV: "pypy3"}
           - {VERSION: "3.11", TOXENV: "py311-useWheel", OS: "windows-2022" }
           # -cryptographyMain
           - {VERSION: "3.6", TOXENV: "py36-cryptographyMain", OS: "ubuntu-20.04"}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 784254535..f7118ebdc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,7 +4,7 @@ Changelog
 Versions are year-based with a strict backward-compatibility policy.
 The third digit is only for regressions.
 
-23.1.0 (UNRELEASED)
+23.1.0 (2023-03-24)
 -------------------
 
 Backward-incompatible changes:
@@ -16,6 +16,7 @@ Deprecations:
 Changes:
 ^^^^^^^^
 
+- ``cryptography`` maximum version has been increased to 40.0.x.
 - Add ``OpenSSL.SSL.Connection.DTLSv1_get_timeout`` and ``OpenSSL.SSL.Connection.DTLSv1_handle_timeout``
   to support DTLS timeouts `#1180 <https://github.com/pyca/pyopenssl/pull/1180>`_.
 
diff --git a/setup.py b/setup.py
index 0ccbbbdf0..42bf2c01b 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,7 @@ def find_meta(meta):
         package_dir={"": "src"},
         install_requires=[
             # Fix cryptographyMinimum in tox.ini when changing this!
-            "cryptography>=38.0.0,<40",
+            "cryptography>=38.0.0,<41",
         ],
         extras_require={
             "test": ["flaky", "pretend", "pytest>=3.0.1"],
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 27cd1fb7d..78ff8bb6b 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -17,7 +17,7 @@
     "__version__",
 ]
 
-__version__ = "23.1.0.dev"
+__version__ = "23.1.0"
 
 __title__ = "pyOpenSSL"
 __uri__ = "https://pyopenssl.org/"