[py] update test/ci configs to use python 3.6 (SeleniumHQ#3415)

vivekdurai · Jan 26, 2017 · da0507b · da0507b
1 parent 3f8afe9
commit da0507b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -120,30 +120,30 @@ matrix:
       addons:
         firefox: latest
     - language: python
-      python: 3.5
+      python: 3.6
       env: TOXENV=flake8
     - language: python
-      python: 3.5
+      python: 3.6
       env: TOXENV=docs
     - language: python
-      python: 3.5
-      env: CHROME=1 TOXENV=py35-chrome
+      python: 3.6
+      env: CHROME=1 TOXENV=py36-chrome
     - language: python
-      python: 3.5
-      env: TOXENV=py35-firefox
+      python: 3.6
+      env: TOXENV=py36-firefox
       addons:
         firefox: latest-esr
     - language: python
-      python: 3.5
-      env: MARIONETTE=1 TOXENV=py35-marionette
+      python: 3.6
+      env: MARIONETTE=1 TOXENV=py36-marionette
       addons:
         firefox: latest
     - language: python
-      python: 3.5
-      env: PHANTOMJS=1 TOXENV=py35-phantomjs
+      python: 3.6
+      env: PHANTOMJS=1 TOXENV=py36-phantomjs
     - language: python
-      python: 3.5
-      env: TOXENV=py35-remote
+      python: 3.6
+      env: TOXENV=py36-remote
       addons:
         firefox: latest
     - language: ruby
@@ -202,9 +202,9 @@ matrix:
     - env: TOXENV=py27-firefox
     - env: MARIONETTE=1 TOXENV=py27-marionette
     - env: TOXENV=py27-remote
-    - env: TOXENV=py35-firefox
-    - env: MARIONETTE=1 TOXENV=py35-marionette
-    - env: TOXENV=py35-remote
+    - env: TOXENV=py36-firefox
+    - env: MARIONETTE=1 TOXENV=py36-marionette
+    - env: TOXENV=py36-remote
     - env: TASK=//rb:docs
 before_install: ./scripts/travis/before_install.sh
 install: ./scripts/travis/install.sh

diff --git a/setup.py b/setup.py
@@ -47,7 +47,8 @@
                     'Programming Language :: Python :: 2.7',
                     'Programming Language :: Python :: 3.3',
                     'Programming Language :: Python :: 3.4',
-                    'Programming Language :: Python :: 3.5'],
+                    'Programming Language :: Python :: 3.5',
+                    'Programming Language :: Python :: 3.6'],
     'package_dir': {
         'selenium': 'py/selenium',
         'selenium.common': 'py/selenium/common',

diff --git a/tox.ini b/tox.ini
@@ -1,22 +1,22 @@
 [tox]
-envlist = py{27,35}-{chrome,edge,firefox,ie,phantomjs,remote,safari}, docs, flake8
+envlist = py{27,36}-{chrome,edge,firefox,ie,phantomjs,remote,safari}, docs, flake8
 
 [testenv]
 passenv = DISPLAY PYTEST_ADDOPTS
 commands =
-  py{27,35}-chrome: py.test -n=auto --driver=Chrome {posargs}
-  py{27,35}-edge: py.test --driver=Edge {posargs}
-  py{27,35}-firefox: py.test -n=auto --driver=Firefox {posargs}
-  py{27,35}-ie: py.test --driver=Ie {posargs}
-  py{27,35}-marionette: py.test -n=auto --driver=Marionette {posargs}
-  py{27,35}-phantomjs: py.test -n=auto --driver=PhantomJS {posargs}
-  py{27,35}-remote: py.test --driver=Remote {posargs}
-  py{27,35}-safari: py.test --driver=Safari {posargs}
+  py{27,36}-chrome: py.test -n=auto --driver=Chrome {posargs}
+  py{27,36}-edge: py.test --driver=Edge {posargs}
+  py{27,36}-firefox: py.test -n=auto --driver=Firefox {posargs}
+  py{27,36}-ie: py.test --driver=Ie {posargs}
+  py{27,36}-marionette: py.test -n=auto --driver=Marionette {posargs}
+  py{27,36}-phantomjs: py.test -n=auto --driver=PhantomJS {posargs}
+  py{27,36}-remote: py.test --driver=Remote {posargs}
+  py{27,36}-safari: py.test --driver=Safari {posargs}
 deps =
   pytest==3.0.3
   pytest-instafail==0.3.0
-  py{27,35}-phantomjs: psutil==4.3.1
-  py{27,35}-{chrome,firefox,marionette,phantomjs}: pytest-xdist==1.15
+  py{27,36}-phantomjs: psutil==4.3.1
+  py{27,36}-{chrome,firefox,marionette,phantomjs}: pytest-xdist==1.15
 
 [testenv:docs]
 skip_install = true