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 /tox.ini | |
| 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
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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 |