3.4.4 - backports, changelog, and version bumps (#5803)

* fixed a circular import error (due to type hints) (#5800) fixes #5794 closes #5795 * Added a py.typed so mypy prefers us to typeshed (#5802) closes #5796 * 3.4.4 changelog + version bump * Update CHANGELOG.rst Co-authored-by: Paul Kehrer <[email protected]> Co-authored-by: Paul Kehrer <[email protected]>
pyca · Feb 9, 2021 · 4a3018e · 4a3018e
1 parent 86c9e4a
commit 4a3018e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+.. _v3-4-4:
+
+3.4.4 - 2021-02-09
+~~~~~~~~~~~~~~~~~~
+
+* Added a ``py.typed`` file so that ``mypy`` will know to use our type
+  annotations.
+* Fixed an import cycle that could be triggered by certain import sequences.
+
 .. _v3-4-3:
 
 3.4.3 - 2021-02-08

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,6 +7,7 @@ include LICENSE.PSF
 include README.rst
 
 include pyproject.toml
+recursive-include src py.typed
 
 recursive-include docs *
 recursive-include src/_cffi_src *.py *.c *.h

diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
@@ -21,7 +21,7 @@
 )
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "3.4.3"
+__version__ = "3.4.4"
 
 __author__ = "The Python Cryptographic Authority and individual contributors"
 __email__ = "[email protected]"

diff --git a/src/cryptography/hazmat/primitives/serialization/base.py b/src/cryptography/hazmat/primitives/serialization/base.py
@@ -25,7 +25,7 @@ def load_pem_public_key(data: bytes, backend=None) -> _PUBLIC_KEY_TYPES:
     return backend.load_pem_public_key(data)
 
 
-def load_pem_parameters(data: bytes, backend=None) -> dh.DHParameters:
+def load_pem_parameters(data: bytes, backend=None) -> "dh.DHParameters":
     backend = _get_backend(backend)
     return backend.load_pem_parameters(data)
 
@@ -42,6 +42,6 @@ def load_der_public_key(data: bytes, backend=None) -> _PUBLIC_KEY_TYPES:
     return backend.load_der_public_key(data)
 
 
-def load_der_parameters(data: bytes, backend=None) -> dh.DHParameters:
+def load_der_parameters(data: bytes, backend=None) -> "dh.DHParameters":
     backend = _get_backend(backend)
     return backend.load_der_parameters(data)
diff --git a/src/cryptography/py.typed b/src/cryptography/py.typed
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
@@ -18,7 +18,7 @@
 
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "3.4.3"
+__version__ = "3.4.4"
 
 __author__ = "The Python Cryptographic Authority and individual contributors"
 __email__ = "[email protected]"