From 337f26126b6d7049fd93b9a314bfe7f784ee418e Mon Sep 17 00:00:00 2001 From: "Nathaniel J. Smith" Date: Thu, 30 Sep 2021 04:41:48 -0700 Subject: [PATCH 1/4] Misc CI cleanups - Update branch names to match upstream - Drop py2 testing --- .github/workflows/ci.yml | 30 ++++++++++++------------------ tox.ini | 10 ++++------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 480dc58bb..e5e2e6ae4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,37 +10,32 @@ jobs: matrix: PYTHON: # Base builds - - {VERSION: "2.7", TOXENV: "py27"} - {VERSION: "3.6", TOXENV: "py36"} - {VERSION: "3.7", TOXENV: "py37"} - {VERSION: "3.8", TOXENV: "py38"} - {VERSION: "3.9", TOXENV: "py39"} - - {VERSION: "pypy2", TOXENV: "pypy"} - {VERSION: "pypy3", TOXENV: "pypy3"} - # -cryptographyMaster - - {VERSION: "3.6", TOXENV: "py36-cryptographyMaster"} - - {VERSION: "3.7", TOXENV: "py37-cryptographyMaster"} - - {VERSION: "3.8", TOXENV: "py38-cryptographyMaster"} - - {VERSION: "3.9", TOXENV: "py39-cryptographyMaster"} - - {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMaster"} + # -cryptographyMain + - {VERSION: "3.6", TOXENV: "py36-cryptographyMain"} + - {VERSION: "3.7", TOXENV: "py37-cryptographyMain"} + - {VERSION: "3.8", TOXENV: "py38-cryptographyMain"} + - {VERSION: "3.9", TOXENV: "py39-cryptographyMain"} + - {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMain"} # -cryptographyMinimum - - {VERSION: "2.7", TOXENV: "py27-cryptographyMinimum"} - {VERSION: "3.6", TOXENV: "py36-cryptographyMinimum"} - {VERSION: "3.7", TOXENV: "py37-cryptographyMinimum"} - {VERSION: "3.8", TOXENV: "py38-cryptographyMinimum"} - {VERSION: "3.9", TOXENV: "py39-cryptographyMinimum"} - - {VERSION: "pypy2", TOXENV: "pypy-cryptographyMinimum"} - {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMinimum"} # Random order - - {VERSION: "2.7", TOXENV: "py27-randomorder"} - {VERSION: "3.9", TOXENV: "py39-randomorder"} # Downstreams - - {VERSION: "3.7", TOXENV: "py37-twistedMaster"} + - {VERSION: "3.7", TOXENV: "py37-twistedTrunk"} # Meta - - {VERSION: "2.7", TOXENV: "check-manifest"} - - {VERSION: "2.7", TOXENV: "pypi-readme"} + - {VERSION: "3.9", TOXENV: "check-manifest"} + - {VERSION: "3.9", TOXENV: "pypi-readme"} - {VERSION: "3.9", TOXENV: "flake8"} - - {VERSION: "2.7", TOXENV: "docs"} + - {VERSION: "3.9", TOXENV: "docs"} name: "${{ matrix.PYTHON.TOXENV }}" steps: - uses: actions/checkout@v2.3.4 @@ -63,10 +58,9 @@ jobs: strategy: matrix: TEST: - - {CONTAINER: "stretch", TOXENV: "py27"} - {CONTAINER: "ubuntu-bionic", TOXENV: "py36"} - # cryptographyMaster used since there's no wheel - - {CONTAINER: "ubuntu-rolling", TOXENV: "py39-cryptographyMaster"} + # cryptographyMain used since there's no wheel + - {CONTAINER: "ubuntu-rolling", TOXENV: "py39-cryptographyMain"} name: "${{ matrix.TEST.TOXENV }} on ${{ matrix.TEST.CONTAINER }}" steps: - uses: actions/checkout@v2.3.4 diff --git a/tox.ini b/tox.ini index a4662c40f..d3fde4699 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {pypy,pypy3,py27,py36,py37,py38,py39}{,-cryptographyMaster,-cryptographyMinimum}{,-randomorder},py37-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report +envlist = {pypy3,py36,py37,py38,py39}{,-cryptographyMain,-cryptographyMinimum}{,-randomorder},py37-twistedTrunk,pypi-readme,check-manifest,flake8,docs,coverage-report [testenv] whitelist_externals = @@ -9,8 +9,7 @@ extras = test deps = coverage>=4.2 - cryptographyMaster: git+https://github.com/pyca/cryptography.git - cryptographyMinimum: cryptography==3.3 + cryptographyMain: git+https://github.com/pyca/cryptography.git randomorder: pytest-randomly setenv = # Do not allow the executing environment to pollute the test environment @@ -22,7 +21,7 @@ commands = coverage run --parallel -m OpenSSL.debug coverage run --parallel -m pytest -v {posargs} -[testenv:py37-twistedMaster] +[testenv:py37-twistedTrunk] deps = Twisted[all_non_platform] @ git+https://github.com/twisted/twisted setenv = @@ -59,9 +58,8 @@ commands = [testenv:docs] extras = docs -basepython = python2.7 commands = - sphinx-build -W -b html doc doc/_build/html + sphinx-build -W -b html doc doc/_build/html {posargs} [testenv:coverage-report] deps = coverage>=4.2 From be99f7ad9bba2b0d988434c1d037f6f59b1d044b Mon Sep 17 00:00:00 2001 From: "Nathaniel J. Smith" Date: Thu, 30 Sep 2021 04:47:25 -0700 Subject: [PATCH 2/4] Appease stricter checking in latest Sphinx to get CI passing again --- doc/api/ssl.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/api/ssl.rst b/doc/api/ssl.rst index 630ebfc6d..e788cf1db 100644 --- a/doc/api/ssl.rst +++ b/doc/api/ssl.rst @@ -150,6 +150,7 @@ Context, Connection. .. autoclass:: Context + :noindex: .. autoclass:: Session @@ -160,6 +161,7 @@ Context, Connection. .. py:class:: Connection(context, socket) + :noindex: A class representing SSL connections. From f3acddefe000e1f96e1393d08419730d7886e625 Mon Sep 17 00:00:00 2001 From: "Nathaniel J. Smith" Date: Thu, 30 Sep 2021 04:59:22 -0700 Subject: [PATCH 3/4] Don't accidentally delete an important line from tox.ini --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index d3fde4699..96a168897 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ extras = deps = coverage>=4.2 cryptographyMain: git+https://github.com/pyca/cryptography.git + cryptographyMinimum: cryptography==3.3 randomorder: pytest-randomly setenv = # Do not allow the executing environment to pollute the test environment From 79c54bae0b5a92cd2d3fc757670c4a3fbadb46ca Mon Sep 17 00:00:00 2001 From: "Nathaniel J. Smith" Date: Mon, 4 Oct 2021 00:04:46 -0700 Subject: [PATCH 4/4] Give py2 support a brief stay of execution As requested by @reaperhulk on IRC --- .github/workflows/ci.yml | 5 +++++ tox.ini | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5e2e6ae4..08d8ae1f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,12 @@ jobs: matrix: PYTHON: # Base builds + - {VERSION: "2.7", TOXENV: "py27"} - {VERSION: "3.6", TOXENV: "py36"} - {VERSION: "3.7", TOXENV: "py37"} - {VERSION: "3.8", TOXENV: "py38"} - {VERSION: "3.9", TOXENV: "py39"} + - {VERSION: "pypy2", TOXENV: "pypy"} - {VERSION: "pypy3", TOXENV: "pypy3"} # -cryptographyMain - {VERSION: "3.6", TOXENV: "py36-cryptographyMain"} @@ -22,12 +24,15 @@ jobs: - {VERSION: "3.9", TOXENV: "py39-cryptographyMain"} - {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMain"} # -cryptographyMinimum + - {VERSION: "2.7", TOXENV: "py27-cryptographyMinimum"} - {VERSION: "3.6", TOXENV: "py36-cryptographyMinimum"} - {VERSION: "3.7", TOXENV: "py37-cryptographyMinimum"} - {VERSION: "3.8", TOXENV: "py38-cryptographyMinimum"} - {VERSION: "3.9", TOXENV: "py39-cryptographyMinimum"} + - {VERSION: "pypy2", TOXENV: "pypy-cryptographyMinimum"} - {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMinimum"} # Random order + - {VERSION: "2.7", TOXENV: "py27-randomorder"} - {VERSION: "3.9", TOXENV: "py39-randomorder"} # Downstreams - {VERSION: "3.7", TOXENV: "py37-twistedTrunk"} diff --git a/tox.ini b/tox.ini index 96a168897..decabbd8a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {pypy3,py36,py37,py38,py39}{,-cryptographyMain,-cryptographyMinimum}{,-randomorder},py37-twistedTrunk,pypi-readme,check-manifest,flake8,docs,coverage-report +envlist = {pypy,pypy3,py27,py36,py37,py38,py39}{,-cryptographyMain,-cryptographyMinimum}{,-randomorder},py37-twistedTrunk,pypi-readme,check-manifest,flake8,docs,coverage-report [testenv] whitelist_externals =