diff --git a/.travis.yml b/.travis.yml index ed690253..8abe97fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ matrix: env: TOXENV=py,codecov - python: 2.7 env: TOXENV=py,codecov - - python: 2.6 - env: TOXENV=py,codecov - python: pypy env: TOXENV=py,codecov - python: nightly diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index f6ff7015..5ab6534a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -109,7 +109,7 @@ depends on which part of Flask you're working on. Travis-CI will run the full suite when you submit your pull request. The full test suite takes a long time to run because it tests multiple -combinations of Python and dependencies. You need to have Python 2.6, 2.7, 3.3, +combinations of Python and dependencies. You need to have Python 2.7, 3.3, 3.4, 3.5 3.6, and PyPy 2.7 installed to run all of the environments. Then run:: tox diff --git a/docs/deploying/fastcgi.rst b/docs/deploying/fastcgi.rst index 5ca2a084..27a3a44e 100644 --- a/docs/deploying/fastcgi.rst +++ b/docs/deploying/fastcgi.rst @@ -111,7 +111,7 @@ Set yourapplication.fcgi:: #!/usr/bin/python #: optional path to your local python site-packages folder import sys - sys.path.insert(0, '/lib/python2.6/site-packages') + sys.path.insert(0, '/lib/python2.7/site-packages') from flup.server.fcgi import WSGIServer from yourapplication import app diff --git a/docs/installation.rst b/docs/installation.rst index 0ae05f06..d700753f 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -7,7 +7,7 @@ Python Version -------------- We recommend using the latest version of Python 3. Flask supports Python 3.3 -and newer, Python 2.6 and newer, and PyPy. +and newer, Python 2.7 and PyPy. Dependencies ------------ diff --git a/flask/cli.py b/flask/cli.py index bea4a29f..ca0ec927 100644 --- a/flask/cli.py +++ b/flask/cli.py @@ -724,9 +724,6 @@ def main(as_module=False): if as_module: this_module = 'flask' - if sys.version_info < (2, 7): - this_module += '.cli' - name = 'python -m ' + this_module # Python rewrites "python -m flask" to the path to the file in argv. diff --git a/scripts/flaskext_tester.py b/scripts/flaskext_tester.py index 93ab0ad7..8a089562 100644 --- a/scripts/flaskext_tester.py +++ b/scripts/flaskext_tester.py @@ -284,7 +284,7 @@ def main(): help='run against all extensions, not just approved') parser.add_argument('--browse', dest='browse', action='store_true', help='show browser with the result summary') - parser.add_argument('--env', dest='env', default='py25,py26,py27', + parser.add_argument('--env', dest='env', default='py27', help='the tox environments to run against') parser.add_argument('--extension=', dest='extension', default=None, help='tests a single extension') diff --git a/setup.py b/setup.py index bb2aab41..328f107f 100644 --- a/setup.py +++ b/setup.py @@ -95,7 +95,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.3', diff --git a/tests/test_regression.py b/tests/test_regression.py index d2c088f7..d467ab6c 100644 --- a/tests/test_regression.py +++ b/tests/test_regression.py @@ -62,9 +62,8 @@ def test_memory_consumption(): # Trigger caches fire() - # This test only works on CPython 2.7. - if sys.version_info >= (2, 7) and \ - not hasattr(sys, 'pypy_translation_info'): + # This test only works on CPython. + if not hasattr(sys, 'pypy_translation_info'): with assert_no_leak(): for x in range(10): fire() diff --git a/tox.ini b/tox.ini index 45d81b65..4804a756 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] envlist = - py{36,35,34,33,27,26,py} + py{36,35,34,33,27,py} py{36,27,py}-simplejson - py{36,33,27,26,py}-devel - py{36,33,27,26,py}-lowest + py{36,33,27,py}-devel + py{36,33,27,py}-lowest docs-html coverage-report @@ -59,8 +59,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