Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.4.4 - backports, changelog, and version bumps #5803

Merged
merged 4 commits into from Feb 9, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions 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 coule be triggered by certain import sequences.
alex marked this conversation as resolved.
Show resolved Hide resolved

.. _v3-4-3:

3.4.3 - 2021-02-08
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cryptography/__about__.py
Expand Up @@ -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__ = "cryptography-dev@python.org"
Expand Down
4 changes: 2 additions & 2 deletions src/cryptography/hazmat/primitives/serialization/base.py
Expand Up @@ -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)

Expand All @@ -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)
Empty file added src/cryptography/py.typed
Empty file.
2 changes: 1 addition & 1 deletion vectors/cryptography_vectors/__about__.py
Expand Up @@ -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__ = "cryptography-dev@python.org"
Expand Down