Merge branch 'master' into one_command

Author: altendky

.github/workflows/ci.yml

@@ -66,20 +66,9 @@ jobs:
       - name: Install
         run: |
           pip install tox
-      - name: Set TOXENV
-        shell: python
-        run: |
-          import sys
-
-          toxenv = '${{ matrix.python.tox }}-${{ matrix.reactor.tox }}reactor'
-
-          if sys.platform == 'win32':
-              toxenv = 'win-' + toxenv
-
-          print('::set-env name=TOXENV::{}'.format(toxenv))
       - name: Test
         run: |
-          tox -v -e "${{ env['TOXENV'] }}"
+          tox -v -e "${{ matrix.python.tox }}-${{ matrix.reactor.tox }}reactor"
   linting:
     name: Linting
     runs-on: ubuntu-latest

appveyor.yml

@@ -8,28 +8,28 @@ environment:
     - TOXENV: py27-defaultreactor
       PYTHON: "C:\\Python27-x64"
 
-    - TOXENV: py35-defaultreactor, win-py35-qt5reactor, py35-asyncioreactor
+    - TOXENV: py35-defaultreactor, py35-qt5reactor, py35-asyncioreactor
       PYTHON: "C:\\Python35"
 
-    - TOXENV: py35-defaultreactor, win-py35-qt5reactor, py35-asyncioreactor
+    - TOXENV: py35-defaultreactor, py35-qt5reactor, py35-asyncioreactor
       PYTHON: "C:\\Python35-x64"
 
-    - TOXENV: py36-defaultreactor, win-py36-qt5reactor, py36-asyncioreactor
+    - TOXENV: py36-defaultreactor, py36-qt5reactor, py36-asyncioreactor
       PYTHON: "C:\\Python36"
 
-    - TOXENV: py36-defaultreactor, win-py36-qt5reactor, py36-asyncioreactor
+    - TOXENV: py36-defaultreactor, py36-qt5reactor, py36-asyncioreactor
       PYTHON: "C:\\Python36-x64"
 
-    - TOXENV: py37-defaultreactor, win-py37-qt5reactor, py37-asyncioreactor
+    - TOXENV: py37-defaultreactor, py37-qt5reactor, py37-asyncioreactor
       PYTHON: "C:\\Python37"
 
-    - TOXENV: py37-defaultreactor, win-py37-qt5reactor, py37-asyncioreactor
+    - TOXENV: py37-defaultreactor, py37-qt5reactor, py37-asyncioreactor
       PYTHON: "C:\\Python37-x64"
 
-    - TOXENV: py38-defaultreactor, win-py38-qt5reactor, py38-asyncioreactor
+    - TOXENV: py38-defaultreactor, py38-qt5reactor, py38-asyncioreactor
       PYTHON: "C:\\Python38"
 
-    - TOXENV: py38-defaultreactor, win-py38-qt5reactor, py38-asyncioreactor
+    - TOXENV: py38-defaultreactor, py38-qt5reactor, py38-asyncioreactor
       PYTHON: "C:\\Python38-x64"
 
 install:

tox.ini

@@ -1,20 +1,20 @@
 [tox]
 envlist=
-    py{27,35}-defaultreactor
+    py27-defaultreactor
     py{35,36,37,38}-{default,qt5,asyncio}reactor
-    win-py{35,36,37,38}-qt5reactor
+    py{35,36,37,38}-qt5reactor
     linting
 
 [testenv]
 deps=
     greenlet
     pytest
     twisted
+    pywin32; sys_platform == 'win32'
     qt5reactor: pytest-qt
     qt5reactor: qt5reactor
     qt5reactor: pytest-xvfb
     qt5reactor: pyqt5
-    win: pywin32
 setenv=
     defaultreactor: REACTOR = default
     qt5reactor: REACTOR = qt5reactor