Be more consistent about supporting Python 3.4 to 3.7

17 files changed, 21 insertions, 30 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a0a9ecb..8d5f6e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,6 @@ workflows:
   test:
     jobs:
       - test-2.7
-      - test-3.3
       - test-3.4
       - test-3.5
       - test-3.6
@@ -39,10 +38,6 @@ jobs:
     <<: *test-template
     docker:
     - image: circleci/python:3.4
-  test-3.3:
-    <<: *test-template
-    docker:
-    - image: circleci/python:3.3
   test-2.7:
     <<: *test-template
     docker:
diff --git a/Makefile b/Makefile
index 610ec3e..fb3b5d5 100644
--- a/Makefile
+++ b/Makefile
@@ -46,9 +46,6 @@ test_all: test_27 test_32 test_33 test_34 test_35 test_37
 test_27:
 	$(TESTBUILD)/bin/python2.7 -m unittest discover
 
-test_33:
-	$(TESTBUILD)/bin/python3.3 -m unittest discover
-
 test_34:
 	$(TESTBUILD)/bin/python3.4 -m unittest discover
 
@@ -63,7 +60,6 @@ test_37:
 
 test_setup:
 	bash test/build_python.sh 2.7.3 $(TESTBUILD)
-	bash test/build_python.sh 3.3.7 $(TESTBUILD)
 	bash test/build_python.sh 3.4.9 $(TESTBUILD)
 	bash test/build_python.sh 3.5.6 $(TESTBUILD)
 	bash test/build_python.sh 3.6.7 $(TESTBUILD)
diff --git a/README.rst b/README.rst
index 88667ef..7531f4f 100644
--- a/README.rst
+++ b/README.rst
@@ -69,7 +69,7 @@ Download and Install
 
 .. __: https://github.com/bottlepy/bottle/raw/master/bottle.py
 
-Install the latest stable release with ``pip install bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard dependencies other than the Python standard library. Bottle runs with **Python 2.7 and 3.3+**.
+Install the latest stable release with ``pip install bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard dependencies other than the Python standard library. Bottle runs with **Python 2.7 and 3.4+**.
 
 
 License
diff --git a/docs/_locale/_pot/index.pot b/docs/_locale/_pot/index.pot
index 48142fe..7c7fc3e 100644
--- a/docs/_locale/_pot/index.pot
+++ b/docs/_locale/_pot/index.pot
@@ -53,7 +53,7 @@ msgid "Download and Install"
 msgstr ""
 
 #: ../../index.rst:49
-msgid "Install the latest stable release with ``pip install bottle``, ``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard [1]_ dependencies other than the Python standard library. Bottle runs with **Python 2.7 and 3.2+**."
+msgid "Install the latest stable release with ``pip install bottle``, ``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard [1]_ dependencies other than the Python standard library. Bottle runs with **Python 2.7 and 3.4+**."
 msgstr ""
 
 #: ../../index.rst:52
diff --git a/docs/_locale/_pot/tutorial.pot b/docs/_locale/_pot/tutorial.pot
index f36b01f..c85eac3 100644
--- a/docs/_locale/_pot/tutorial.pot
+++ b/docs/_locale/_pot/tutorial.pot
@@ -37,7 +37,7 @@ msgid "This will get you the latest development snapshot that includes all the n
 msgstr ""
 
 #: ../../tutorial.rst:47
-msgid "Either way, you'll need Python 2.7 or newer (including 3.2+) to run bottle applications. If you do not have permissions to install packages system-wide or simply don't want to, create a `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ first:"
+msgid "Either way, you'll need Python 2.7 or newer (including 3.4+) to run bottle applications. If you do not have permissions to install packages system-wide or simply don't want to, create a `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ first:"
 msgstr ""
 
 #: ../../tutorial.rst:55
diff --git a/docs/_locale/de_DE/LC_MESSAGES/index.po b/docs/_locale/de_DE/LC_MESSAGES/index.po
index 5468b6b..28095fc 100644
--- a/docs/_locale/de_DE/LC_MESSAGES/index.po
+++ b/docs/_locale/de_DE/LC_MESSAGES/index.po
@@ -71,7 +71,7 @@ msgid ""
 "Install the latest stable release with ``pip install bottle``, "
 "``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your "
 "project directory. There are no hard [1]_ dependencies other than the Python"
-" standard library. Bottle runs with **Python 2.7 and 3.2+**."
+" standard library. Bottle runs with **Python 2.7 and 3.4+**."
 msgstr ""
 
 #: ../../index.rst:52
diff --git a/docs/_locale/de_DE/LC_MESSAGES/tutorial.po b/docs/_locale/de_DE/LC_MESSAGES/tutorial.po
index 4c69909..c63c799 100644
--- a/docs/_locale/de_DE/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/de_DE/LC_MESSAGES/tutorial.po
@@ -56,7 +56,7 @@ msgstr ""
 
 #: ../../tutorial.rst:47
 msgid ""
-"Either way, you'll need Python 2.7 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 or newer (including 3.4+) to run bottle "
 "applications. If you do not have permissions to install packages system-wide"
 " or simply don't want to, create a `virtualenv "
 "<http://pypi.python.org/pypi/virtualenv>`_ first:"
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/index.po b/docs/_locale/pt_BR/LC_MESSAGES/index.po
index 04155e7..5d78776 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/index.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/index.po
@@ -75,8 +75,8 @@ msgid ""
 "Install the latest stable release with ``pip install bottle``, "
 "``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your "
 "project directory. There are no hard [1]_ dependencies other than the Python"
-" standard library. Bottle runs with **Python 2.7 and 3.2+**."
-msgstr "Instale a última versão estável com ``pip install bottle``, ``easy_install -U bottle`` ou faça o download do `bottle.py`__(instável) dentro do diretório do seu projeto. Não há depedências [1]_ além das bibliotecas padrões do Python. Bottle é compatível com **Python 2.7 e 3.2+**."
+" standard library. Bottle runs with **Python 2.7 and 3.4+**."
+msgstr "Instale a última versão estável com ``pip install bottle``, ``easy_install -U bottle`` ou faça o download do `bottle.py`__(instável) dentro do diretório do seu projeto. Não há depedências [1]_ além das bibliotecas padrões do Python. Bottle é compatível com **Python 2.7 e 3.4+**."
 
 #: ../../index.rst:52
 msgid "User's Guide"
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po b/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po
index 9d92adf..b1e2e1b 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/tutorial.po
@@ -58,11 +58,11 @@ msgstr "Isso vai te dar o último snapshot de desenvolvimento que inclui todos o
 
 #: ../../tutorial.rst:47
 msgid ""
-"Either way, you'll need Python 2.7 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 or newer (including 3.4+) to run bottle "
 "applications. If you do not have permissions to install packages system-wide"
 " or simply don't want to, create a `virtualenv "
 "<http://pypi.python.org/pypi/virtualenv>`_ first:"
-msgstr "De qualquer maneira, você irá precisar do Python 2.7 ou mais recente (incluindo 3.2+) para executar aplicações bottle. Se você não tem permissões para instalar pacotes globalmente no sistema ou simplesmente não deseja fazer, crie uma `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ primeiro:"
+msgstr "De qualquer maneira, você irá precisar do Python 2.7 ou mais recente (incluindo 3.4+) para executar aplicações bottle. Se você não tem permissões para instalar pacotes globalmente no sistema ou simplesmente não deseja fazer, crie uma `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ primeiro:"
 
 #: ../../tutorial.rst:55
 msgid "Or, if virtualenv is not installed on your system:"
diff --git a/docs/_locale/ru_RU/LC_MESSAGES/index.po b/docs/_locale/ru_RU/LC_MESSAGES/index.po
index c786f63..85ef785 100644
--- a/docs/_locale/ru_RU/LC_MESSAGES/index.po
+++ b/docs/_locale/ru_RU/LC_MESSAGES/index.po
@@ -71,7 +71,7 @@ msgid ""
 "Install the latest stable release with ``pip install bottle``, "
 "``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your "
 "project directory. There are no hard [1]_ dependencies other than the Python"
-" standard library. Bottle runs with **Python 2.7 or 3.2+**."
+" standard library. Bottle runs with **Python 2.7 or 3.4+**."
 msgstr ""
 
 #: ../../index.rst:52
diff --git a/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po b/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po
index b383bbf..439bdb0 100644
--- a/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/ru_RU/LC_MESSAGES/tutorial.po
@@ -56,7 +56,7 @@ msgstr ""
 
 #: ../../tutorial.rst:47
 msgid ""
-"Either way, you'll need Python 2.7 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 or newer (including 3.4+) to run bottle "
 "applications. If you do not have permissions to install packages system-wide"
 " or simply don't want to, create a `virtualenv "
 "<http://pypi.python.org/pypi/virtualenv>`_ first:"
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/index.po b/docs/_locale/zh_CN/LC_MESSAGES/index.po
index bf1999a..1643558 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/index.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/index.po
@@ -71,7 +71,7 @@ msgid ""
 "Install the latest stable release with ``pip install bottle``, "
 "``easy_install -U bottle`` or download `bottle.py`__ (unstable) into your "
 "project directory. There are no hard [1]_ dependencies other than the Python"
-" standard library. Bottle runs with **Python 2.7 and 3.2+**."
+" standard library. Bottle runs with **Python 2.7 and 3.4+**."
 msgstr ""
 
 #: ../../index.rst:52
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po b/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po
index 4e398a5..feb4dba 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/tutorial.po
@@ -56,7 +56,7 @@ msgstr "在终端运行以上命令，即可下载到Bottle的最新开发版，
 
 #: ../../tutorial.rst:47
 msgid ""
-"Either way, you'll need Python 2.7 or newer (including 3.2+) to run bottle "
+"Either way, you'll need Python 2.7 or newer (including 3.4+) to run bottle "
 "applications. If you do not have permissions to install packages system-wide"
 " or simply don't want to, create a `virtualenv "
 "<http://pypi.python.org/pypi/virtualenv>`_ first:"
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 34f48ab..a8f000c 100755
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,19 +10,19 @@ Release 0.13
 
 .. warning:: Not released yet.
 
-.. rubric:: Dropped support for Python 2.5, 2.6 and 3.1
+.. rubric:: Dropped support for Python 2.5, 2.6, 3.1, 3.2 and 3.3
 
-These three Python versions are no longer maintained by the Python Software Foundation and reached their end of life a long time ago. Keeping up support for ancient Python versions hinders adaptation of new features and serves no real purpose. Even Debian 7 (wheezy) and Ubuntu 12.4 (precise), both outdated, ship with Python 2.7.3 and 3.2.3 already. For this reason, we decided to drop support for Python 2.5, 2.6 and 3.1. The updated list of tested and supported python releases is as follows:
+These three Python versions are no longer maintained by the Python Software Foundation and reached their end of life a long time ago. Keeping up support for ancient Python versions hinders adaptation of new features and serves no real purpose. Even Debian 7 (wheezy) and Ubuntu 12.4 (precise), both outdated, ship with Python 2.7.3 and 3.2.3 already. For this reason, we decided to drop support for Python 2.5, 2.6, 3.1, 3.2 and 3.1. The updated list of tested and supported python releases is as follows:
 
  * Python 2.7 (>= 2.7.3)
- * Python 3.2
- * Python 3.3
  * Python 3.4
  * Python 3.5
+ * Python 3.6
+ * Python 3.7
  * PyPy 5.3
  * PyPy3 2.4
 
-Support for Python 2.5 was marked as deprecated since 0.12. We decided to go a step further and also remove 2.6 and 3.1 support even if it was never deprecated explicitly in bottle. This means that this release is *not* backwards compatible in Python 2.6 or 3.1 environments. Maintainers for distributions or systems that still use these old python versions should not update to Bottle 0.13 and stick with 0.12 instead.
+Support for Python 2.5 was marked as deprecated since 0.12. We decided to go a step further and also remove 2.6, 3.1, 3.2 and 3.3 support even if it was never deprecated explicitly in bottle. This means that this release is *not* backwards compatible in Python <2.7 or <3.4 environments. Maintainers for distributions or systems that still use these old python versions should not update to Bottle 0.13 and stick with 0.12 instead.
 
 .. rubric:: Stabilized APIs
 * The documented API of the :class:`ConfigDict` class is now considered stable and ready to use.
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 852afcf..06e40f9 100755
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -44,7 +44,7 @@ This will get you the latest development snapshot that includes all the new feat
     $ sudo easy_install bottle             # alternative without pip
     $ sudo apt-get install python-bottle   # works for debian, ubuntu, ...
 
-Either way, you'll need Python 2.7 or newer (including 3.2+) to run bottle applications. If you do not have permissions to install packages system-wide or simply don't want to, create a `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ first:
+Either way, you'll need Python 2.7 or newer (including 3.4+) to run bottle applications. If you do not have permissions to install packages system-wide or simply don't want to, create a `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ first:
 
 .. code-block:: bash
 
diff --git a/setup.py b/setup.py
index bcedd9d..b0f5685 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import setup
 
 if sys.version_info < (2, 7):
-    raise NotImplementedError("Sorry, you need at least Python 2.7 or Python 3.2+ to use bottle.")
+    raise NotImplementedError("Sorry, you need at least Python 2.7 or Python 3.4+ to use bottle.")
 
 import bottle
 
diff --git a/tox.ini b/tox.ini
index c795073..2d19901 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35,py36,py27-most
+envlist = py27,py34,py35,py36,py37,py27-most
 
 [testenv]
 deps=Mako