Merge branch 'cclauss-patch-1'

ponty · Sep 3, 2017 · 634422f · 634422f
2 parents cb2529e + dff144f
commit 634422f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
  - "3.3"
  - "3.4"
  - "3.5"
+ - "3.6"
 
 before_install:
   - sudo apt-get update -qq

diff --git a/README.rst b/README.rst
@@ -9,7 +9,7 @@ Links:
 
 Features:
  - python wrapper
- - supported python versions: 2.7, 3.3, 3.4, 3.5
+ - supported python versions: 2.7, 3.3, 3.4, 3.5, 3.6
  - back-ends: Xvfb_, Xephyr_, Xvnc_
 
 .. warning:: at least one back-end should be installed

diff --git a/Vagrantfile b/Vagrantfile
@@ -71,7 +71,7 @@ Vagrant.configure(2) do |config|
 # install python versions
   sudo add-apt-repository --yes  ppa:fkrull/deadsnakes
   sudo apt-get update
-  sudo apt-get install -y python2.7-dev python3.3-dev python3.4-dev python3.5-dev
+  sudo apt-get install -y python2.7-dev python3.3-dev python3.4-dev  python3.5-dev python3.6-dev
 
 # tools
   sudo apt-get install -y mc python-pip xvfb

diff --git a/setup.py b/setup.py
@@ -48,6 +48,7 @@
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
 ]
 
 install_requires = ['EasyProcess']

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 
 [tox]
-envlist = py27,py33,py34,py35
+envlist = py27,py33,py34,py35,py36
 
 [testenv]
 changedir=tests