From 608c1319612c30d882b6f245c0298aa61efc1797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pr=C3=BCsse?= Date: Thu, 20 Aug 2020 13:55:10 -0300 Subject: [PATCH 1/2] Restrict pytest-selenium version matcher pytest-selenium did drop support for PhantomJS in version 2.0.0. --- environment.devenv.yml | 2 +- esss_environment.devenv.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.devenv.yml b/environment.devenv.yml index 04af193..6360dab 100644 --- a/environment.devenv.yml +++ b/environment.devenv.yml @@ -25,7 +25,7 @@ dependencies: - pytest-mock - pytest-qt - pytest-rerunfailures - - pytest-selenium + - pytest-selenium >=1,<2 - pytest-timeout {% if sys.platform != 'win32' %} - pytest-xvfb diff --git a/esss_environment.devenv.yml b/esss_environment.devenv.yml index 984b903..ad6d03c 100644 --- a/esss_environment.devenv.yml +++ b/esss_environment.devenv.yml @@ -1,4 +1,4 @@ -{% set TEST_QMXGRAPH = os.environ.get('TEST_QMXGRAPH', '0') != '0' %} +% set TEST_QMXGRAPH = os.environ.get('TEST_QMXGRAPH', '0') != '0' %} name: qmxgraph @@ -53,7 +53,7 @@ dependencies: - phantomjs>=2.1 - pytest-mock>=1.4.0 - pytest-qt>=2.1.0 - - pytest-selenium>=1.2.1 + - pytest-selenium>=1.2.1,<2 - pytest-timeout>=1.0.0 - pytest-xdist>=1.15 {% if sys.platform != 'win32' %} From 92980a1f6460edeeb3004decba37ecd23e74b044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pr=C3=BCsse?= Date: Thu, 20 Aug 2020 18:12:52 -0300 Subject: [PATCH 2/2] Fix missing `{` in esss_environment.devenv.yml --- esss_environment.devenv.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esss_environment.devenv.yml b/esss_environment.devenv.yml index ad6d03c..e2d98dd 100644 --- a/esss_environment.devenv.yml +++ b/esss_environment.devenv.yml @@ -1,4 +1,4 @@ -% set TEST_QMXGRAPH = os.environ.get('TEST_QMXGRAPH', '0') != '0' %} +{% set TEST_QMXGRAPH = os.environ.get('TEST_QMXGRAPH', '0') != '0' %} name: qmxgraph