Skip to content

Commit 24ad5be

Browse files
authored
fix testing against cryptography main branch and improve twisted (#1209)
* fix testing against cryptography main branch and improve twisted * oops
1 parent f4f77cc commit 24ad5be

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# Random order
4242
- {VERSION: "3.9", TOXENV: "py39-randomorder"}
4343
# Downstreams
44-
- {VERSION: "3.7", TOXENV: "py37-twistedTrunk"}
44+
- {VERSION: "3.11", TOXENV: "py311-twistedTrunk"}
4545
# Meta
4646
- {VERSION: "3.9", TOXENV: "check-manifest"}
4747
- {VERSION: "3.9", TOXENV: "flake8"}

tox.ini

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{py,py3,36,37,38,39,310,311}{,-cryptographyMain,-cryptographyMinimum}{,-useWheel}{,-randomorder},py37-twistedTrunk,check-manifest,flake8,py311-mypy,docs,coverage-report
2+
envlist = py{py,py3,36,37,38,39,310,311}{,-cryptographyMinimum}{,-useWheel}{,-randomorder},py311-twistedTrunk,check-manifest,flake8,py311-mypy,docs,coverage-report
33

44
[testenv]
55
allowlist_externals =
@@ -18,7 +18,6 @@ extras =
1818
test
1919
deps =
2020
coverage>=4.2
21-
cryptographyMain: git+https://github.com/pyca/cryptography.git
2221
cryptographyMinimum: cryptography==38.0.0
2322
randomorder: pytest-randomly
2423
setenv =
@@ -28,17 +27,17 @@ setenv =
2827
PIP_NO_BINARY=cryptography
2928
useWheel: PIP_NO_BINARY=
3029
commands =
30+
cryptographyMain: pip install -U git+https://github.com/pyca/cryptography.git
3131
openssl version
3232
coverage run --parallel -m OpenSSL.debug
3333
coverage run --parallel -m pytest -v {posargs}
3434

35-
[testenv:py37-twistedTrunk]
35+
[testenv:py311-twistedTrunk]
3636
deps =
3737
Twisted[all_non_platform] @ git+https://github.com/twisted/twisted
3838
setenv =
3939
commands =
40-
python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))"
41-
python -c "import cryptography; print(cryptography.__version__)"
40+
python -m OpenSSL.debug
4241
python -m twisted.trial -j4 --reporter=text twisted
4342

4443
[testenv:flake8]

0 commit comments

Comments
 (0)