From 0b4e6de25aa382bb16eef6751c3fd4da7fe5b520 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 19 Aug 2016 01:44:38 -0700
Subject: attempt to add testing for py36

---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 0156d9e51..a029182d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,9 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,pypy,
+    py27,py33,py34,py35,py36,pypy,
     docs,pep8,
     {py2,py3}-cover,coverage,
+skip-missing-interpreters = True
 
 [testenv]
 # Most of these are defaults but if you specify any you can't fall back
@@ -12,6 +13,7 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: nightly
     pypy: pypy
     py2: python2.7
     py3: python3.5
-- 
cgit v1.2.3


From 202ad628a1431a70fe5557f8fc3ca2d6b0f9314c Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 19 Aug 2016 02:12:26 -0700
Subject: attempt to add testing for py36

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tox.ini')

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
-- 
cgit v1.2.3


From 1941d27c65c99a38b29dde9536e71d08dc9f64d9 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 19 Aug 2016 02:56:27 -0700
Subject: attempt to add testing for py36

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 6ba30c2a5..a74aaadbc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
     pypy: pypy
     py2: python2.7
     py3: python3.5
-- 
cgit v1.2.3


From a5c8100d780155643063742c716ac8d2f54e2e45 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 1 Sep 2016 00:30:13 -0500
Subject: drop support for python 3.3 and error on 2.6

closes #2476
---
 tox.ini | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index a74aaadbc..8ceb142cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,py36,pypy,
+    py27,py34,py35,py36,pypy,
     docs,pep8,
     {py2,py3}-cover,coverage,
 skip-missing-interpreters = True
@@ -10,7 +10,6 @@ skip-missing-interpreters = True
 # to defaults for others.
 basepython =
     py27: python2.7
-    py33: python3.3
     py34: python3.4
     py35: python3.5
     py36: python3.6
@@ -28,12 +27,6 @@ commands =
     python pyramid/scaffolds/tests.py
 deps = virtualenv
 
-[testenv:py33-scaffolds]
-basepython = python3.3
-commands =
-    python pyramid/scaffolds/tests.py
-deps = virtualenv
-
 [testenv:py34-scaffolds]
 basepython = python3.4
 commands =
-- 
cgit v1.2.3