From 24ad5be8251c39817796db4334a21dbf3cd666e0 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 15 Apr 2023 07:16:08 +0800 Subject: fix testing against cryptography main branch and improve twisted (#1209) * fix testing against cryptography main branch and improve twisted * oops --- .github/workflows/ci.yml | 2 +- tox.ini | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9217a3..d120cf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: # Random order - {VERSION: "3.9", TOXENV: "py39-randomorder"} # Downstreams - - {VERSION: "3.7", TOXENV: "py37-twistedTrunk"} + - {VERSION: "3.11", TOXENV: "py311-twistedTrunk"} # Meta - {VERSION: "3.9", TOXENV: "check-manifest"} - {VERSION: "3.9", TOXENV: "flake8"} diff --git a/tox.ini b/tox.ini index 148d6bc..a298c94 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{py,py3,36,37,38,39,310,311}{,-cryptographyMain,-cryptographyMinimum}{,-useWheel}{,-randomorder},py37-twistedTrunk,check-manifest,flake8,py311-mypy,docs,coverage-report +envlist = py{py,py3,36,37,38,39,310,311}{,-cryptographyMinimum}{,-useWheel}{,-randomorder},py311-twistedTrunk,check-manifest,flake8,py311-mypy,docs,coverage-report [testenv] allowlist_externals = @@ -18,7 +18,6 @@ extras = test deps = coverage>=4.2 - cryptographyMain: git+https://github.com/pyca/cryptography.git cryptographyMinimum: cryptography==38.0.0 randomorder: pytest-randomly setenv = @@ -28,17 +27,17 @@ setenv = PIP_NO_BINARY=cryptography useWheel: PIP_NO_BINARY= commands = + cryptographyMain: pip install -U git+https://github.com/pyca/cryptography.git openssl version coverage run --parallel -m OpenSSL.debug coverage run --parallel -m pytest -v {posargs} -[testenv:py37-twistedTrunk] +[testenv:py311-twistedTrunk] deps = Twisted[all_non_platform] @ git+https://github.com/twisted/twisted setenv = commands = - python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))" - python -c "import cryptography; print(cryptography.__version__)" + python -m OpenSSL.debug python -m twisted.trial -j4 --reporter=text twisted [testenv:flake8] -- cgit v1.2.1