From 5c597cffbf54325128d6e2e709d765c567aedbd7 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 5 Jul 2022 08:49:09 -0400 Subject: [PATCH 1/4] Version bump and changelog for 37.0.4 --- CHANGELOG.rst | 7 +++++++ src/cryptography/__about__.py | 2 +- vectors/cryptography_vectors/__about__.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d52a0ee41aac..617560d123fe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog ========= +.. _v37-0-4: + +37.0.4 - 2022-07-05 +~~~~~~~~~~~~~~~~~~~ + +* Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.0.5. + .. _v37-0-3: 37.0.3 - 2022-06-21 diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index b581d90b6fe0..399beb6684fe 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -9,7 +9,7 @@ "__copyright__", ] -__version__ = "37.0.3" +__version__ = "37.0.4" __author__ = "The Python Cryptographic Authority and individual contributors" __copyright__ = "Copyright 2013-2022 {}".format(__author__) diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index 5af72d578be5..280a0dd62a25 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -6,4 +6,4 @@ "__version__", ] -__version__ = "37.0.3" +__version__ = "37.0.4" From ee16ba0e90dde25bf8f44078939fa3e6ed9c8fef Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 30 Jun 2022 23:13:15 -0400 Subject: [PATCH 2/4] silence a new clippy warning from rust 1.62 for now (#7384) --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 44aa97af3564..1594fec2f007 100644 --- a/tox.ini +++ b/tox.ini @@ -75,7 +75,10 @@ allowlist_externals = cargo commands = cargo fmt --all -- --check - cargo clippy -- -D warnings + # Temporarily allow clippy::drop-non-drop until + # https://github.com/joshua-maros/ouroboros/pull/63 is merged and + # released. + cargo clippy -- -D warnings --allow clippy::drop-non-drop cargo test --no-default-features [flake8] From aa47999e81e67239b6a8eba4526b7a2cfa78628b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 2 Jul 2022 23:13:49 -0400 Subject: [PATCH 3/4] pin rust nightly until regression is fixed (#7388) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc90a2f7cbf5..9dee594a3523 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -259,7 +259,7 @@ jobs: - {VERSION: "3.10", TOXENV: "py310"} RUST: - beta - - nightly + - nightly-2022-06-30 name: "Rust Coverage" timeout-minutes: 15 steps: From 4ae39446d94e0f5a890bc971f63049b21ed4c3fa Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 3 Jul 2022 11:45:28 -0400 Subject: [PATCH 4/4] Don't force an upgrade of cffi (#7389) It breaks on pypy where we always want the cffi that came with pypy, not one from pypi. --- .github/workflows/wheel-builder.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml index fff1af3246ea..232836d72f17 100644 --- a/.github/workflows/wheel-builder.yml +++ b/.github/workflows/wheel-builder.yml @@ -237,7 +237,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - - run: python -m pip install -U pip wheel cffi setuptools-rust + - run: python -m pip install -U pip wheel + - run: python -m pip install cffi setuptools-rust - run: python setup.py sdist - run: tar zxvf dist/cryptography*.tar.gz && mkdir wheelhouse shell: bash