summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoris Roovers <jroovers@cisco.com>2017-03-11 10:58:59 +0100
committerJoris Roovers <jroovers@cisco.com>2017-03-11 10:58:59 +0100
commit2694ea1a37d3d8d5f19be530985a54ebddf19b73 (patch)
treee595cd55c5725437669761c16f3165a1e43b8284
parent019762db5daf6b28e45cb3c2e5f10b258608b4ed (diff)
Experimental python 3.6 support
Adding experimental support for python 3.6, temporarily disabling running pylint for 3.6 because of https://github.com/PyCQA/pylint/issues/1072
-rw-r--r--.travis.yml2
-rw-r--r--Vagrantfile2
-rwxr-xr-xrun_tests.sh2
-rw-r--r--setup.py3
4 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 2b4af6d..5d06366 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
os: linux
- python: "3.5"
os: linux
- # Skip lint tests for python 3.6
+ # Skip lint tests for python 3.6 (see https://github.com/PyCQA/pylint/issues/1072)
- python: "3.6"
os: linux
script:
diff --git a/Vagrantfile b/Vagrantfile
index 7b1e54e..c787257 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,7 +7,7 @@ INSTALL_DEPS=<<EOF
cd /vagrant
sudo add-apt-repository -y ppa:fkrull/deadsnakes
sudo apt-get update
-sudo apt-get install -y python2.6-dev python2.7-dev python3.3-dev python3.4-dev python3.5-dev
+sudo apt-get install -y python2.6-dev python2.7-dev python3.3-dev python3.4-dev python3.5-dev python3.6-dev
sudo apt-get install -y python-virtualenv git ipython python3-pip silversearcher-ag
sudo pip3 install virtualenv
diff --git a/run_tests.sh b/run_tests.sh
index ddbfa8e..f9f037e 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -328,7 +328,7 @@ exit_code=0
# If the users specified 'all', then just replace $envs with the list of all envs
if [ "$envs" == "all" ]; then
- envs="26,27,33,34,35,pypy2"
+ envs="26,27,33,34,35,36,pypy2"
fi
envs=$(echo "$envs" | tr ',' '\n') # Split the env list on comma so we can loop through it
diff --git a/setup.py b/setup.py
index 1451d80..5832849 100644
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,9 @@ setup(
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: Implementation :: CPython",
+ "Programming Language :: Python :: Implementation :: PyPy",
"Environment :: Console",
"Intended Audience :: Developers",
"Topic :: Software Development :: Quality Assurance",