summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-08-19 02:12:26 -0700
committerSteve Piercy <web@stevepiercy.com>2016-08-19 02:12:26 -0700
commit202ad628a1431a70fe5557f8fc3ca2d6b0f9314c (patch)
treea3d5e39c516c77e1f83e6e1ff17b451bd06ce1b1
parent0b4e6de25aa382bb16eef6751c3fd4da7fe5b520 (diff)
downloadpyramid-202ad628a1431a70fe5557f8fc3ca2d6b0f9314c.tar.gz
pyramid-202ad628a1431a70fe5557f8fc3ca2d6b0f9314c.tar.bz2
pyramid-202ad628a1431a70fe5557f8fc3ca2d6b0f9314c.zip
attempt to add testing for py36
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini1
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index a5ae0977e..7528a948a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,8 @@ matrix:
env: TOXENV=docs
- python: 3.5
env: TOXENV=pep8
+ - python: nightly
+ env: TOXENV=py36
allow_failures:
- env: TOXENV=py36
diff --git a/tox.ini b/tox.ini
index a029182d3..6ba30c2a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,6 @@ basepython =
py33: python3.3
py34: python3.4
py35: python3.5
- py36: nightly
pypy: pypy
py2: python2.7
py3: python3.5