summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2023-03-24 16:47:23 -0400
committerGitHub <noreply@github.com>2023-03-25 04:47:23 +0800
commit983aa3151e38849a495720fa6b607d7b9cc53f89 (patch)
tree25aa56347241cc5485984f0173a70f3a743dc185
parent41f1deb6d689d41b300245dd4d8b2df19b0af9bf (diff)
downloadpyopenssl-git-983aa3151e38849a495720fa6b607d7b9cc53f89.tar.gz
reopen main (#1200)
-rw-r--r--.github/workflows/ci.yml1
-rw-r--r--CHANGELOG.rst12
-rw-r--r--src/OpenSSL/version.py2
3 files changed, 13 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1fa11af..c9217a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,6 @@ jobs:
- {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"}
- {VERSION: "3.7", TOXENV: "py37-cryptographyMain"}
- {VERSION: "3.8", TOXENV: "py38-cryptographyMain"}
- {VERSION: "3.9", TOXENV: "py39-cryptographyMain"}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f7118eb..8de589f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,18 @@ Changelog
Versions are year-based with a strict backward-compatibility policy.
The third digit is only for regressions.
+23.2.0 (UNRELEASED)
+-------------------
+
+Backward-incompatible changes:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Deprecations:
+^^^^^^^^^^^^^
+
+Changes:
+^^^^^^^^
+
23.1.0 (2023-03-24)
-------------------
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 78ff8bb..60c945c 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -17,7 +17,7 @@ __all__ = [
"__version__",
]
-__version__ = "23.1.0"
+__version__ = "23.2.0.dev"
__title__ = "pyOpenSSL"
__uri__ = "https://pyopenssl.org/"