aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Cordasco <sigmavirus24@users.noreply.github.com>2017-01-28 14:53:57 -0600
committerGitHub <noreply@github.com>2017-01-28 14:53:57 -0600
commitf183e3fc1e5d248059174768b31e36529a513875 (patch)
treee0ec99e246d34fbb2113861d73e181c018ff36dd
parent27e7eba74b763ef5e1f75b6c8bf40a7e9530478f (diff)
parent0a78fbd582d66e5b53282d2f37e129501e0e47a4 (diff)
downloadplatform_external_python_uritemplates-f183e3fc1e5d248059174768b31e36529a513875.tar.gz
platform_external_python_uritemplates-f183e3fc1e5d248059174768b31e36529a513875.tar.bz2
platform_external_python_uritemplates-f183e3fc1e5d248059174768b31e36529a513875.zip
Merge pull request #30 from brettcannon/python-3.6
Support Python 3.6
-rw-r--r--.travis.yml2
-rw-r--r--setup.py1
-rw-r--r--tox.ini1
3 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index b7c9b48..c4783f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
+ - python: 3.6
+ env: TOXENV=py36
- env: TOXENV=pep8
install:
diff --git a/setup.py b/setup.py
index 59f03ba..7f37118 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@ 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',
],
)
diff --git a/tox.ini b/tox.ini
index 9d86da0..a1d7cc4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ envlist =
py33,
py34,
py35,
+ py36,
pep8,
[testenv]