revert change to xenial and python 3.7, builds are taking too long

SeleniumHQ · Aug 3, 2018 · 0c561b6 · 0c561b6
1 parent de14071
commit 0c561b6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: trusty
 sudo: required
 env:
   global:
@@ -100,29 +100,29 @@ matrix:
       <<: *python
     - env: TOXENV=flake8
       <<: *python
-      python: 3.7
+      python: 3.6
     - env: TOXENV=docs
       <<: *python
-      python: 3.7
-    - env: TOXENV=py37-unit
+      python: 3.6
+    - env: TOXENV=py36-unit
       <<: *python
-      python: 3.7
-    - env: CHROME=1 TOXENV=py37-chrome
+      python: 3.6
+    - env: CHROME=1 TOXENV=py36-chrome
       <<: *python
       <<: *chrome
-      python: 3.7
-    - env: TOXENV=py37-firefox
+      python: 3.6
+    - env: TOXENV=py36-firefox
       <<: *python
       <<: *firefox-esr
-      python: 3.7
-    - env: TOXENV=py37-remote
+      python: 3.6
+    - env: TOXENV=py36-remote
       <<: *python
       <<: *firefox-esr
-      python: 3.7
-    - env: MARIONETTE=1 TOXENV=py37-marionette
+      python: 3.6
+    - env: MARIONETTE=1 TOXENV=py36-marionette
       <<: *python
       <<: *firefox-nightly
-      python: 3.7
+      python: 3.6
     - env: TASK=//rb:unit-test
       <<: *ruby
     - env: CHROME=1 TASK=//rb:chrome-test

diff --git a/py/tox.ini b/py/tox.ini
@@ -1,23 +1,23 @@
 [tox]
-envlist = py{27,34,35,36,37}-{unit,chrome,edge,firefox,ie,remote,safari}, docs, flake8
+envlist = py{27,34,35,36}-{unit,chrome,edge,firefox,ie,remote,safari}, docs, flake8
 
 [testenv]
 passenv = DISPLAY PYTEST_ADDOPTS CI TRAVIS
 commands =
-  py{27,34,35,36,37}-unit: py.test -n=auto {posargs:test/unit}
-  py{27,37}-chrome: py.test --driver=Chrome {posargs}
-  py{27,37}-edge: py.test --driver=Edge {posargs}
-  py{27,37}-firefox: py.test --driver=Firefox {posargs}
-  py{27,37}-ie: py.test --driver=Ie {posargs}
-  py{27,37}-marionette: py.test --driver=Marionette {posargs}
-  py{27,37}-remote: py.test --driver=Remote {posargs}
-  py{27,37}-safari: py.test --driver=Safari {posargs}
+  py{27,34,35,36}-unit: py.test -n=auto {posargs:test/unit}
+  py{27,36}-chrome: py.test --driver=Chrome {posargs}
+  py{27,36}-edge: py.test --driver=Edge {posargs}
+  py{27,36}-firefox: py.test --driver=Firefox {posargs}
+  py{27,36}-ie: py.test --driver=Ie {posargs}
+  py{27,36}-marionette: py.test --driver=Marionette {posargs}
+  py{27,36}-remote: py.test --driver=Remote {posargs}
+  py{27,36}-safari: py.test --driver=Safari {posargs}
 install_command = pip install -v --no-index --find-links=../third_party/py {opts} {packages}
 deps =
   pytest==3.0.3
   pytest-instafail==0.3.0
   pytest-mock==1.5.0
-  py{27,33,34,35,36,37}-{unit,chrome,firefox,marionette}: pytest-xdist==1.15
+  py{27,33,34,35,36}-{unit,chrome,firefox,marionette}: pytest-xdist==1.15
   urllib3==1.23
 
 [testenv:docs]