summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2021-08-24 13:01:04 -0400
committerGitHub <noreply@github.com>2021-08-24 13:01:04 -0400
commit70ccc2542cf3bf374861b55f6527424307722763 (patch)
treed59c33352e24625e5d1296c75bdb36f225db2e8b
parenta19014a087759f3df72b2cd70ed7a0d8a6481340 (diff)
downloadcryptography-3.4.x.tar.gz
bump version and changelog for 3.4.8 (#6225)3.4.83.4.x
* bump version and changelog for 3.4.8 * add a flake8 ignore * more CI bitrot * still more * one day * ugh, twisted
-rwxr-xr-x.github/downstream.d/certbot.sh4
-rw-r--r--.github/workflows/ci.yml13
-rw-r--r--CHANGELOG.rst8
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--tox.ini3
-rw-r--r--vectors/cryptography_vectors/__about__.py2
6 files changed, 20 insertions, 12 deletions
diff --git a/.github/downstream.d/certbot.sh b/.github/downstream.d/certbot.sh
index e2890a3a1..2479d0c25 100755
--- a/.github/downstream.d/certbot.sh
+++ b/.github/downstream.d/certbot.sh
@@ -5,8 +5,8 @@ case "${1}" in
git clone --depth=1 https://github.com/certbot/certbot
cd certbot
git rev-parse HEAD
- tools/pip_install_editable.py ./acme[dev]
- tools/pip_install_editable.py ./certbot[dev]
+ tools/pip_install_editable.py ./acme[test]
+ tools/pip_install_editable.py ./certbot[test]
;;
run)
cd certbot
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd967a3a0..a7dd7e0e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,9 +18,9 @@ jobs:
- {VERSION: "3.9", TOXENV: "flake,rust,docs", COVERAGE: "false"}
- {VERSION: "pypy3", TOXENV: "pypy3"}
- {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "openssl", VERSION: "1.1.0l"}}
- - {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1i"}}
- - {VERSION: "3.9", TOXENV: "py39-ssh", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1i"}}
- - {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1i", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct"}}
+ - {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1l"}}
+ - {VERSION: "3.9", TOXENV: "py39-ssh", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1l"}}
+ - {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1l", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct"}}
- {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "libressl", VERSION: "2.9.2"}}
- {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "libressl", VERSION: "3.0.2"}}
- {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "libressl", VERSION: "3.1.5"}}
@@ -107,10 +107,10 @@ jobs:
- {IMAGE: "sid", TOXENV: "py39"}
- {IMAGE: "ubuntu-bionic", TOXENV: "py36"}
- {IMAGE: "ubuntu-focal", TOXENV: "py38"}
- - {IMAGE: "ubuntu-rolling", TOXENV: "py38"}
- - {IMAGE: "ubuntu-rolling", TOXENV: "py38-randomorder"}
+ - {IMAGE: "ubuntu-rolling", TOXENV: "py39"}
+ - {IMAGE: "ubuntu-rolling", TOXENV: "py39-randomorder"}
- {IMAGE: "fedora", TOXENV: "py39"}
- - {IMAGE: "alpine", TOXENV: "py38"}
+ - {IMAGE: "alpine", TOXENV: "py39"}
name: "${{ matrix.IMAGE.TOXENV }} on ${{ matrix.IMAGE.IMAGE }}"
timeout-minutes: 30
steps:
@@ -301,7 +301,6 @@ jobs:
DOWNSTREAM:
- paramiko
- pyopenssl
- - twisted
- aws-encryption-sdk
- dynamodb-encryption-sdk
- certbot
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fa2ee1500..e4b6278e8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,14 @@
Changelog
=========
+.. _v3-4-8:
+
+3.4.8 - 2021-08-24
+~~~~~~~~~~~~~~~~~~
+
+* Updated Windows, macOS, and ``manylinux`` wheels to be compiled with
+ OpenSSL 1.1.1l.
+
.. _v3-4-7:
3.4.7 - 2021-03-25
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 095215591..52cd08e5b 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.7"
+__version__ = "3.4.8"
__author__ = "The Python Cryptographic Authority and individual contributors"
__email__ = "cryptography-dev@python.org"
diff --git a/tox.ini b/tox.ini
index 93f4b253a..e5e0955af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,6 +46,7 @@ extras =
ssh
deps =
mypy
+ types-pytz
check-manifest
commands =
flake8 .
@@ -63,7 +64,7 @@ commands =
cargo clippy -- -D warnings
[flake8]
-ignore = E203,E211,W503,W504
+ignore = E203,E211,W503,W504,N818
exclude = .tox,*.egg,.git,_build,.hypothesis
select = E,W,F,N,I
application-import-names = cryptography,cryptography_vectors,tests
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index a6dbd1e5f..45adb3362 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.7"
+__version__ = "3.4.8"
__author__ = "The Python Cryptographic Authority and individual contributors"
__email__ = "cryptography-dev@python.org"