summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-01-02 00:08:49 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-01-01 21:08:49 -0800
commit717fe63db6945f65a5d71930d6fb42110bcf0229 (patch)
tree069029a79fed056e697c60f66e3c851140e2c663
parentfdd28f4f96f5095090d57d10fb59b8d59a909ab7 (diff)
downloadpy-bcrypt-git-717fe63db6945f65a5d71930d6fb42110bcf0229.tar.gz
We do the py36 (#102)
-rw-r--r--.travis.yml4
-rw-r--r--setup.py2
-rw-r--r--tox.ini2
3 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index bbcb336..b27f7f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ matrix:
env: TOXENV=py34 CC=gcc
- python: 3.5
env: TOXENV=py35 CC=gcc
+ - python: 3.6
+ env: TOXENV=py36 CC=gcc
- python: pypy
env: TOXENV=pypy CC=gcc
- python: 2.6
@@ -26,6 +28,8 @@ matrix:
env: TOXENV=py34 CC=clang
- python: 3.5
env: TOXENV=py35 CC=clang
+ - python: 3.6
+ env: TOXENV=py36 CC=clang
- python: pypy
env: TOXENV=pypy CC=clang
- python: 2.7
diff --git a/setup.py b/setup.py
index 3ec6579..13a98f3 100644
--- a/setup.py
+++ b/setup.py
@@ -229,6 +229,8 @@ setup(
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
+ "Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
],
ext_package="bcrypt",
diff --git a/tox.ini b/tox.ini
index 264d9aa..6417ccd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,pypy,py33,py34,py35,pep8,py3pep8,packaging
+envlist = py26,py27,pypy,py33,py34,py35,py36,pep8,py3pep8,packaging
[testenv]
# If you add a new dep here you probably need to add it in setup.py as well