Decolonize CI

Author: njsmith

.github/workflows/ci.yml

@@ -15,12 +15,12 @@ jobs:
           - {VERSION: "3.8", TOXENV: "py38"}
           - {VERSION: "3.9", TOXENV: "py39"}
           - {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: "3.6", TOXENV: "py36-cryptographyMinimum"}
           - {VERSION: "3.7", TOXENV: "py37-cryptographyMinimum"}
@@ -30,7 +30,7 @@ jobs:
           # Random order
           - {VERSION: "3.9", TOXENV: "py39-randomorder"}
           # Downstreams
-          - {VERSION: "3.7", TOXENV: "py37-twistedMaster"}
+          - {VERSION: "3.7", TOXENV: "py37-twistedTrunk"}
           # Meta
           - {VERSION: "3.9", TOXENV: "check-manifest"}
           - {VERSION: "3.9", TOXENV: "pypi-readme"}
@@ -59,8 +59,8 @@ jobs:
       matrix:
         TEST:
           - {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/[email protected]

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {pypy3,py36,py37,py38,py39}{,-cryptographyMaster,-cryptographyMinimum}{,-randomorder},py37-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = {pypy3,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 =