Revert "-pyXX not a thing any more here"

This reverts commit 22c1ffd.

.travis.yml

@@ -29,59 +29,60 @@ matrix:
       env: TOXENV=mypy
 
     - python: 2.7
-      env: TOXENV=coverage-py27-tw171,codecov
+      env: TOXENV=coverage-py27-tw171,codecov-py27
     - python: 2.7
-      env: TOXENV=coverage-py27-tw184,codecov
+      env: TOXENV=coverage-py27-tw184,codecov-py27
     - python: 2.7
-      env: TOXENV=coverage-py27-twcurrent,codecov
+      env: TOXENV=coverage-py27-twcurrent,codecov-py27
 
     - python: 3.5
-      env: TOXENV=coverage-py35-tw171,codecov
+      env: TOXENV=coverage-py35-tw171,codecov-py35
     - python: 3.5
-      env: TOXENV=coverage-py35-tw184,codecov
+      env: TOXENV=coverage-py35-tw184,codecov-py35
     - python: 3.5
+      env: TOXENV=coverage-py35-twcurrent,codecov-py35
 
     - python: 3.6
-      env: TOXENV=coverage-py36-tw171,codecov
+      env: TOXENV=coverage-py36-tw171,codecov-py36
     - python: 3.6
-      env: TOXENV=coverage-py36-tw184,codecov
+      env: TOXENV=coverage-py36-tw184,codecov-py36
     - python: 3.6
-      env: TOXENV=coverage-py36-twcurrent,codecov
+      env: TOXENV=coverage-py36-twcurrent,codecov-py36
 
     - python: 3.7
-      env: TOXENV=coverage-py37-tw171,codecov
+      env: TOXENV=coverage-py37-tw171,codecov-py37
     - python: 3.7
-      env: TOXENV=coverage-py37-tw184,codecov
+      env: TOXENV=coverage-py37-tw184,codecov-py37
     - python: 3.7
-      env: TOXENV=coverage-py37-twcurrent,codecov
+      env: TOXENV=coverage-py37-twcurrent,codecov-py37
 
     - python: 3.8
-      env: TOXENV=coverage-py38-tw171,codecov
+      env: TOXENV=coverage-py38-tw171,codecov-py38
     - python: 3.8
-      env: TOXENV=coverage-py38-tw184,codecov
+      env: TOXENV=coverage-py38-tw184,codecov-py38
     - python: 3.8
-      env: TOXENV=coverage-py38-twcurrent,codecov
+      env: TOXENV=coverage-py38-twcurrent,codecov-py38
 
     - python: pypy
-      env: TOXENV=coverage-pypy2-tw171,codecov
+      env: TOXENV=coverage-pypy2-tw171,codecov-pypy2
     - python: pypy
-      env: TOXENV=coverage-pypy2-tw184,codecov
+      env: TOXENV=coverage-pypy2-tw184,codecov-pypy2
     - python: pypy
-      env: TOXENV=coverage-pypy2-twcurrent,codecov
+      env: TOXENV=coverage-pypy2-twcurrent,codecov-pypy2
 
     - python: pypy3
-      env: TOXENV=coverage-pypy3-tw171,codecov
+      env: TOXENV=coverage-pypy3-tw171,codecov-pypy3
     - python: pypy3
-      env: TOXENV=coverage-pypy3-tw184,codecov
+      env: TOXENV=coverage-pypy3-tw184,codecov-pypy3
     - python: pypy3
-      env: TOXENV=coverage-pypy3-twcurrent,codecov
+      env: TOXENV=coverage-pypy3-twcurrent,codecov-pypy3
 
     # Test against Twisted trunk in case something in development breaks us.
     # This is allowed to fail below, since the bug may be in Twisted.
     - python: 2.7
-      env: TOXENV=coverage-py27-twtrunk,codecov
+      env: TOXENV=coverage-py27-twtrunk,codecov-py27
     - python: 3.8
-      env: TOXENV=coverage-py38-twtrunk,codecov
+      env: TOXENV=coverage-py38-twtrunk,codecov-py38
 
     - python: 2.7
       env: TOXENV=docs
@@ -90,6 +91,8 @@ matrix:
 
   allow_failures:
     # Tests against Twisted trunk are allow to fail, as they are not supported.
+    - env: TOXENV=coverage-py27-twtrunk,codecov-py27
+    - env: TOXENV=coverage-py38-twtrunk,codecov-py38
     - env: TOXENV=coverage-py27-twtrunk,codecov
     - env: TOXENV=coverage-py38-twtrunk,codecov