From 8edfa4281e7c860f297f2be3057c1be1b2b453f8 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 24 Apr 2015 17:34:10 +0200 Subject: [PATCH] Revert "tox.ini: Use pytest-qt from git." This reverts commit 71608af4867f61b7bb9e22318680c78383d793fc. --- tox.ini | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index b11817280..d1e337271 100644 --- a/tox.ini +++ b/tox.ini @@ -16,13 +16,11 @@ usedevelop = true [testenv:unittests] setenv = QT_QPA_PLATFORM_PLUGIN_PATH={envsitepackagesdir}/PyQt5/plugins/platforms -# Using pytest-qt from git because of -# https://github.com/pytest-dev/pytest-qt/pull/38 deps = py==1.4.26 pytest==2.7.0 pytest-capturelog==0.7 - git+https://github.com/pytest-dev/pytest-qt.git + pytest-qt==1.3.0 pytest-mock==0.4.3 # We don't use {[testenv:mkvenv]commands} here because that seems to be broken # on Ubuntu Trusty.