diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2021-02-09 12:29:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 11:29:25 -0600 |
| commit | 4a3018e6ae3e04a250be9fd1c1a1ad115727f517 (patch) | |
| tree | 04ebbc7f7d13b582bb2dbbb5fe3f5b7e20e59123 | |
| parent | 86c9e4a763579d6b2369db83064c0c4b8e9c1c77 (diff) | |
| download | cryptography-3.4.4.tar.gz | |
3.4.4 - backports, changelog, and version bumps (#5803)3.4.4
* 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 <paul.l.kehrer@gmail.com>
Co-authored-by: Paul Kehrer <paul.l.kehrer@gmail.com>
| -rw-r--r-- | CHANGELOG.rst | 9 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | src/cryptography/hazmat/primitives/serialization/base.py | 4 | ||||
| -rw-r--r-- | src/cryptography/py.typed | 0 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
6 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index db99d97d6..b1481a7cc 100644 --- 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 index 4b4ec2dfc..78889eaeb 100644 --- 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 index a885bd2a6..63adf6987 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -21,7 +21,7 @@ __summary__ = ( ) __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" diff --git a/src/cryptography/hazmat/primitives/serialization/base.py b/src/cryptography/hazmat/primitives/serialization/base.py index 00334b2e3..9f7531db2 100644 --- 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 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/cryptography/py.typed diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index a03447d19..e726f336b 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -18,7 +18,7 @@ __summary__ = "Test vectors for the cryptography package." __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" |