Skip to content

Commit

Permalink
fix testing against cryptography main branch and improve twisted (#1209)
Browse files Browse the repository at this point in the history
* fix testing against cryptography main branch and improve twisted

* oops
  • Loading branch information
reaperhulk authored Apr 14, 2023
1 parent f4f77cc commit 24ad5be
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
9 changes: 4 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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 =
Expand All @@ -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 =
Expand All @@ -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]
Expand Down

0 comments on commit 24ad5be

Please sign in to comment.