From 4290066994d423bbf51cbf45a69300dac27361f0 Mon Sep 17 00:00:00 2001
From: A5rocks <git@helvetica.moe>
Date: Thu, 2 Jan 2025 10:47:12 +0900
Subject: [PATCH 1/3] Polish off #670

---
 newsfragments/670.bugfix.rst | 1 +
 src/trustme/__init__.py      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 newsfragments/670.bugfix.rst

diff --git a/newsfragments/670.bugfix.rst b/newsfragments/670.bugfix.rst
new file mode 100644
index 0000000..1236380
--- /dev/null
+++ b/newsfragments/670.bugfix.rst
@@ -0,0 +1 @@
+Update from deprecated pyOpenSSL APIs to non-deprecated cryptography APIs.
diff --git a/src/trustme/__init__.py b/src/trustme/__init__.py
index 6f3cc00..1040892 100644
--- a/src/trustme/__init__.py
+++ b/src/trustme/__init__.py
@@ -8,7 +8,7 @@
 from contextlib import contextmanager
 from enum import Enum
 from tempfile import NamedTemporaryFile
-from typing import TYPE_CHECKING, Generator, List, Optional, Union, cast
+from typing import TYPE_CHECKING, Generator, List, Optional, Union
 
 import idna
 from cryptography import x509

From 6d39f51de72ce21bbb1d3842f8ed795b39e4cc9b Mon Sep 17 00:00:00 2001
From: A5rocks <git@helvetica.moe>
Date: Thu, 2 Jan 2025 10:48:44 +0900
Subject: [PATCH 2/3] Bump version to 1.2.1

---
 docs/source/index.rst        | 9 +++++++++
 newsfragments/670.bugfix.rst | 1 -
 src/trustme/_version.py      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 newsfragments/670.bugfix.rst

diff --git a/docs/source/index.rst b/docs/source/index.rst
index f0cce82..0be2520 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -122,6 +122,15 @@ Change history
 
 .. towncrier release notes start
 
+Trustme 1.2.1 (2025-01-02)
+--------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Update from deprecated pyOpenSSL APIs to non-deprecated cryptography APIs. (`#670 <https://github.com/python-trio/trustme/issues/670>`__)
+
+
 Trustme 1.2.0 (2024-10-07)
 --------------------------
 
diff --git a/newsfragments/670.bugfix.rst b/newsfragments/670.bugfix.rst
deleted file mode 100644
index 1236380..0000000
--- a/newsfragments/670.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update from deprecated pyOpenSSL APIs to non-deprecated cryptography APIs.
diff --git a/src/trustme/_version.py b/src/trustme/_version.py
index 6b88fe2..a955fda 100644
--- a/src/trustme/_version.py
+++ b/src/trustme/_version.py
@@ -1 +1 @@
-__version__ = "1.2.0+dev"
+__version__ = "1.2.1"

From 0cf75f7ef12bf36354c61ff7652b6ce125691921 Mon Sep 17 00:00:00 2001
From: A5rocks <git@helvetica.moe>
Date: Thu, 2 Jan 2025 10:55:56 +0900
Subject: [PATCH 3/3] Start new cycle

---
 src/trustme/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/trustme/_version.py b/src/trustme/_version.py
index a955fda..8f239b6 100644
--- a/src/trustme/_version.py
+++ b/src/trustme/_version.py
@@ -1 +1 @@
-__version__ = "1.2.1"
+__version__ = "1.2.1+dev"