Skip to content

Misc CI cleanups #1045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reaperhulk merged 4 commits into from
Oct 4, 2021
Merged

Misc CI cleanups #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
337f261
Misc CI cleanups
njsmith Sep 30, 2021
be99f7a
Appease stricter checking in latest Sphinx to get CI passing again
njsmith Sep 30, 2021
f3acdde
Don't accidentally delete an important line from tox.ini
njsmith Sep 30, 2021
79c54ba
Give py2 support a brief stay of execution
njsmith Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions doc/api/ssl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ Context, Connection.


.. autoclass:: Context
:noindex:

.. autoclass:: Session

Expand All @@ -160,6 +161,7 @@ Context, Connection.


.. py:class:: Connection(context, socket)
:noindex:

A class representing SSL connections.

Expand Down
9 changes: 4 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand All @@ -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
Comment thread
njsmith marked this conversation as resolved.
randomorder: pytest-randomly
setenv =
Expand All @@ -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 =
Expand Down Expand Up @@ -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
Expand Down