diff options
| author | Nathaniel J. Smith <njs@pobox.com> | 2021-10-04 00:11:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 15:11:00 +0800 |
| commit | 91d670ff9353e1040ff87e369f3098167bd86ee0 (patch) | |
| tree | 3185dbaf185fe958900a19a03ac3dd141a90c531 | |
| parent | 7c619dffbc33446d0ce02964753a8abebc984658 (diff) | |
| download | pyopenssl-91d670ff9353e1040ff87e369f3098167bd86ee0.tar.gz | |
Misc CI cleanups (#1045)
* Misc CI cleanups
- Update branch names to match upstream
- Drop py2 testing
* Appease stricter checking in latest Sphinx to get CI passing again
* Don't accidentally delete an important line from tox.ini
* Give py2 support a brief stay of execution
As requested by @reaperhulk on IRC
| -rw-r--r-- | .github/workflows/ci.yml | 25 | ||||
| -rw-r--r-- | doc/api/ssl.rst | 2 | ||||
| -rw-r--r-- | tox.ini | 9 |
3 files changed, 18 insertions, 18 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 480dc58..08d8ae1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,12 @@ jobs: - {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"} @@ -35,12 +35,12 @@ jobs: - {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 +63,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/doc/api/ssl.rst b/doc/api/ssl.rst index 630ebfc..e788cf1 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. @@ -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 = {pypy,pypy3,py27,py36,py37,py38,py39}{,-cryptographyMain,-cryptographyMinimum}{,-randomorder},py37-twistedTrunk,pypi-readme,check-manifest,flake8,docs,coverage-report [testenv] whitelist_externals = @@ -9,7 +9,7 @@ extras = test deps = coverage>=4.2 - cryptographyMaster: git+https://github.com/pyca/cryptography.git + cryptographyMain: git+https://github.com/pyca/cryptography.git cryptographyMinimum: cryptography==3.3 randomorder: pytest-randomly setenv = @@ -22,7 +22,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 +59,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 |