Tests: Import qtpy instead of setting PYTEST_QT_API

blink1073 · Jul 27, 2016 · ddca816 · ddca816
1 parent 8b79807
commit ddca816
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -49,6 +49,5 @@ script:
   - ./continuous_integration/travis/build_test.sh
   - ./continuous_integration/travis/run_test.sh
   - ./continuous_integration/travis/modules_test.sh
-  - if [ "${USE_QT_API}" = "PyQt4" ]; then export PYTEST_QT_API=pyqt4v2; fi
   - python runtests.py
   - coveralls
diff --git a/appveyor.yml b/appveyor.yml
@@ -27,5 +27,4 @@ test_script:
   - "%CMD_IN_ENV% %APPVEYOR_BUILD_FOLDER%\\continuous_integration\\appveyor\\build_test.bat"
   - "%CMD_IN_ENV% %APPVEYOR_BUILD_FOLDER%\\continuous_integration\\appveyor\\run_test.bat"
   - "%CMD_IN_ENV% %APPVEYOR_BUILD_FOLDER%\\continuous_integration\\appveyor\\modules_test.bat"
-  - if %USE_QT_API%==PyQt4 set PYTEST_QT_API=pyqt4v2
   - cd %APPVEYOR_BUILD_FOLDER% & python runtests.py
diff --git a/runtests.py b/runtests.py
@@ -12,6 +12,7 @@
 import sys
 
 # Third party imports
+import qtpy  # to ensure that Qt4 uses API v2
 import pytest