Merge pull request #28 from vtitor/master

Fix appveyor

Author: vtitor

.travis.yml

@@ -15,6 +15,6 @@ addons:
 
 install:
   - pip install tox
-  - export TOX_ENV=`tox --listenvs | grep "py${TRAVIS_PYTHON_VERSION/./}" | tr '\n' ','`
+  - export TOX_ENV=`tox --listenvs | grep -v win | grep "py${TRAVIS_PYTHON_VERSION/./}" | tr '\n' ','`
 
 script: tox -e $TOX_ENV

appveyor.yml

@@ -2,51 +2,38 @@ environment:
   VENV: "%APPVEYOR_BUILD_FOLDER%\\venv"
 
   matrix:
-    - TOXENV: py27
+    - TOXENV: py27-defaultreactor
       PYTHON: "C:\\Python27"
 
-    - TOXENV: py27
+    - TOXENV: py27-defaultreactor
       PYTHON: "C:\\Python27-x64"
 
-    - TOXENV: py34
+    - TOXENV: py34-defaultreactor
       PYTHON: "C:\\Python34"
 
-    - TOXENV: py34
+    - TOXENV: py34-defaultreactor
       PYTHON: "C:\\Python34-x64"
 
-    - TOXENV: py35
+    - TOXENV: py35-defaultreactor, win-py35-qt5reactor
       PYTHON: "C:\\Python35"
 
-    - TOXENV: py35
+    - TOXENV: py35-defaultreactor, win-py35-qt5reactor
       PYTHON: "C:\\Python35-x64"
 
-    - TOXENV: py36
+    - TOXENV: py36-defaultreactor, win-py36-qt5reactor
       PYTHON: "C:\\Python36"
 
-    - TOXENV: py36
+    - TOXENV: py36-defaultreactor, win-py36-qt5reactor
       PYTHON: "C:\\Python36-x64"
 
-# https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
-init:
-  - ps: if (Get-ChildItem Env:ENABLE_RDP -ErrorAction SilentlyContinue) {iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))} else {echo RDP not enabled}
-  - echo "TOXENV- %TOXENV%"
-
 install:
   # https://github.com/pypa/virtualenv/issues/1050
   - pip install -U git+https://github.com/pypa/virtualenv@e8163e83a92c9098f51d390289323232ece15e3b
   - virtualenv -p "%PYTHON%\\python.exe" "%VENV%"
   - "%VENV%\\Scripts\\activate"
-  # https://github.com/pypa/virtualenv/issues/1050
-  - pip install git+https://github.com/pypa/virtualenv@e8163e83a92c9098f51d390289323232ece15e3b
   - pip install tox
 
 build: off
 
 test_script:
-  - where tox
-  - tox --version
   - tox
-
-# https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
-on_finish:
-  - ps: if (Get-ChildItem Env:ENABLE_RDP -ErrorAction SilentlyContinue) {$blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))} else {echo RDP not enabled}

tox.ini

@@ -2,9 +2,9 @@
 envlist=
     py{27,34}-defaultreactor
     py{35,36}-{default,qt5}reactor
+    win-py{35,36}-qt5reactor
     linting
 
-
 [testenv]
 deps=
     greenlet
@@ -14,9 +14,10 @@ deps=
     qt5reactor: qt5reactor
     qt5reactor: pytest-xvfb
     qt5reactor: pyqt5
+    win: pywin32
 commands=
-    defaultreactor: py.test --reactor=default []
-    qt5reactor: py.test --reactor=qt5reactor []
+    defaultreactor: py.test --reactor=default
+    qt5reactor: py.test --reactor=qt5reactor
 sitepackages=False
 
 [testenv:linting]
@@ -25,3 +26,6 @@ commands=flake8 *.py testing
 
 [flake8]
 ignore=N802
+
+[pytest]
+addopts=-v