Merge pull request #85 from ESSS/fb-ASIM-3684-update-with-master3

Update our long-lived branch with master
ESSS · Sep 3, 2020 · b4dcdcd · b4dcdcd
2 parents 1ce6905 + 92980a1
commit b4dcdcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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' %}