drop support for python 3.3 and error on 2.6

closes #2476

7 files changed, 12 insertions, 24 deletions

diff --git a/.travis.yml b/.travis.yml
index 7528a948a..b46f677a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ matrix:
     include:
         - python: 2.7
           env: TOXENV=py27
-        - python: 3.3
-          env: TOXENV=py33
         - python: 3.4
           env: TOXENV=py34
         - python: 3.5
diff --git a/HACKING.txt b/HACKING.txt
index 5bbdce0c6..86ba5d0ca 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -124,10 +124,10 @@ In order to add a feature to Pyramid:
 - The feature must be documented in both the API and narrative
   documentation (in ``docs/``).
 
-- The feature must work fully on the following CPython versions: 2.6, 2.7, 3.2,
-  3.3, 3.4, and 3.5 on both UNIX and Windows.
+- The feature must work fully on the following CPython versions: 2.7, 3.2,
+  3.4, and 3.5 on both UNIX and Windows.
 
-- The feature must work on the latest version of PyPy and PyPy3.
+- The feature must work on the latest version of PyPy.
 
 - The feature must not cause installation or runtime failure on App Engine.
   If it doesn't cause installation or runtime failure, but doesn't actually
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index c59ced2a5..677c27e4a 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -21,9 +21,8 @@ the following sections.
 
 .. sidebar:: Python Versions
 
-    As of this writing, :app:`Pyramid` has been tested under Python 2.7,
-    Python 3.3, Python 3.4, Python 3.5, PyPy, and PyPy3. :app:`Pyramid` does
-    not run under any version of Python before 2.7.
+    As of this writing, :app:`Pyramid` is tested against Python 2.7,
+    Python 3.4, Python 3.5, PyPy.
 
 :app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux,
 Mac OS X, and FreeBSD, as well as on Windows platforms.  It is also known to
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index de6ac408b..47638579b 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -860,7 +860,7 @@ Every release of Pyramid has 100% statement coverage via unit and integration
 tests, as measured by the ``coverage`` tool available on PyPI.  It also has
 greater than 95% decision/condition coverage as measured by the
 ``instrumental`` tool available on PyPI. It is automatically tested by Travis,
-and Jenkins on Python 2.7, Python 3.3, Python 3.4, Python 3.5, PyPy, and PyPy3
+and Jenkins on Python 2.7, Python 3.4, Python 3.5, and PyPy
 after each commit to its GitHub repository. Official Pyramid add-ons are held
 to a similar testing standard.  We still find bugs in Pyramid and its official
 add-ons, but we've noticed we find a lot more of them while working on other
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index 958347a90..1de9a8acf 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -19,7 +19,7 @@ virtual environment.)
 
 This *Quick Tutorial* is based on:
 
-* **Python 3.5**. Pyramid fully supports Python 3.3+ and Python 2.7+. This
+* **Python 3.5**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
   tutorial uses **Python 3.5** but runs fine under Python 2.7.
 
 * **venv**. We believe in virtual environments. For this tutorial, we use
diff --git a/setup.py b/setup.py
index 021da2b5f..f738ee623 100644
--- a/setup.py
+++ b/setup.py
@@ -18,16 +18,15 @@ import sys
 from setuptools import setup, find_packages
 
 py_version = sys.version_info[:2]
-is_pypy = '__pypy__' in sys.builtin_module_names
 
 PY3 = py_version[0] == 3
 
 if PY3:
-    if py_version < (3, 3) and not is_pypy: # PyPy3 masquerades as Python 3.2...
-        raise RuntimeError('On Python 3, Pyramid requires Python 3.3 or better')
+    if py_version < (3, 4):
+        raise RuntimeError('On Python 3, Pyramid requires Python 3.4 or better')
 else:
-    if py_version < (2, 6):
-        raise RuntimeError('On Python 2, Pyramid requires Python 2.6 or better')
+    if py_version < (2, 7):
+        raise RuntimeError('On Python 2, Pyramid requires Python 2.7 or better')
 
 here = os.path.abspath(os.path.dirname(__file__))
 try:
@@ -81,7 +80,6 @@ setup(name='pyramid',
           "Programming Language :: Python",
           "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
-          "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: Implementation :: CPython",
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 =