From: Florian Bruhin Date: Wed, 27 Jun 2018 19:48:02 +0000 (+0200) Subject: Also drop Python 2.6 X-Git-Tag: 2.11.0~114^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5425921899f7c84b3a08e2dd06610beacb2fc20e;p=thirdparty%2Fjinja.git Also drop Python 2.6 --- diff --git a/.travis.yml b/.travis.yml index 897f0b68..ea2ec218 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ python: - 3.5 - 3.4 - 2.7 - - 2.6 - pypy env: diff --git a/CHANGES.rst b/CHANGES.rst index 868070e2..213ad49f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -12,7 +12,7 @@ unreleased - Async support is only loaded the first time an :class:`~environment.Environment` enables it, in order to avoid a slow initial import. (`#765`_) -- Python 3.3 is not supported anymore. +- Python 2.6 and 3.3 are not supported anymore. .. _#765: https://github.com/pallets/jinja/issues/765 diff --git a/docs/faq.rst b/docs/faq.rst index 967fcec9..4a700954 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -147,8 +147,8 @@ work in production environments:: Credit for this snippet goes to `Thomas Johansson `_ -Why is there no Python 2.3/2.4/2.5/3.1/3.2/3.3 support? -------------------------------------------------------- +Why is there no Python 2.3/2.4/2.5/2.6/3.1/3.2/3.3 support? +----------------------------------------------------------- Python 2.3 is missing a lot of features that are used heavily in Jinja2. This decision was made as with the upcoming Python 2.6 and 3.0 versions it becomes @@ -162,9 +162,9 @@ drop support because only Python 2.6/2.7 and >=3.3 support byte and unicode literals in a way compatible to each other version. If you really need support for older Python 2 (or 3) versions, you can just use Jinja2 2.6. -Python 3.3 support was dropped because it got dropped in various upstream +Python 2.6/3.3 support was dropped because it got dropped in various upstream projects (such as wheel or pytest), which would make it difficult to continue -supporting it. Jinja2 2.10 was the last version supporting Python 3.3. +supporting it. Jinja2 2.10 was the last version supporting Python 2.6/3.3. My Macros are overridden by something ------------------------------------- diff --git a/docs/intro.rst b/docs/intro.rst index 652b891a..38e3ab98 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -12,10 +12,10 @@ useful for templating environments. Prerequisites ------------- -Jinja2 works with Python 2.6.x, 2.7.x and >= 3.4. If you are using Python +Jinja2 works with Python 2.7.x and >= 3.4. If you are using Python 3.2 you can use an older release of Jinja2 (2.6) as support for Python 3.2 -was dropped in Jinja2 version 2.7. The last release which supported Python 3.3 -was Jinja2 2.10. +was dropped in Jinja2 version 2.7. The last release which supported Python 2.6 +and 3.3 was Jinja2 2.10. If you wish to use the :class:`~jinja2.PackageLoader` class, you will also need `setuptools`_ or `distribute`_ installed at runtime. diff --git a/setup.py b/setup.py index b42a1393..7c3f33d9 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,6 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', diff --git a/tox.ini b/tox.ini index d20f08f8..4c8ac4cb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{36,35,34,27,26,py} + py{36,35,34,27,py} docs-html coverage-report @@ -34,8 +34,6 @@ passenv = CI TRAVIS TRAVIS_* deps = codecov skip_install = true commands = - # install argparse for 2.6 - python -c 'import sys, pip; sys.version_info < (2, 7) and pip.main(["install", "argparse", "-q"])' coverage combine coverage report codecov