diff --git a/.travis.yml b/.travis.yml index 1c0a256ed..5df0e85d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ sudo: false language: python python: - "2.7" - - "2.6" - "pypy" before_install: - sh -c set diff --git a/docs/quickstart.rst b/docs/quickstart.rst index d7161123b..ebef68b49 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -31,13 +31,13 @@ Install Python -------------- Check if you already have an adequate version of Python installed by running -``python -V``. Python v2.6 (v2.6.6 or greater recommended) or Python v2.7 -will work. Python v3 does not work. On Windows, we recommend the use of -native Python v2.7, not Cygwin Python. If you don't have one of these -versions of Python installed, `download`_ and install the latest version of -Python v2.7. Make sure that the path to the installation directory has no -spaces in it (e.g. on Windows, do not install Python in the "Program Files" -directory). +``python -V``. The latest version of Python v2.7 is recommended. Python v2.6.x +is no longer officially supported, but might still work. Python v3 does not +work. On Windows, we recommend the use of native Python v2.7, not Cygwin +Python. If you don't have one of these versions of Python installed, +`download`_ and install the latest version of Python v2.7. Make sure that the +path to the installation directory has no spaces in it (e.g. on Windows, do not +install Python in the "Program Files" directory). .. _download: https://www.python.org/downloads/ diff --git a/setup.py b/setup.py index 035b0c9c3..63697e004 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -import sys; assert sys.version_info < (3,), ur"Tahoe-LAFS does not run under Python 3. Please use a version of Python between 2.6 and 2.7.x inclusive." +import sys; assert sys.version_info < (3,), ur"Tahoe-LAFS does not run under Python 3. Please use Python 2.7.x." # Tahoe-LAFS -- secure, distributed storage grid # @@ -101,7 +101,6 @@ trove_classifiers=[ "Programming Language :: C", "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Topic :: Utilities", "Topic :: System :: Systems Administration", @@ -249,7 +248,7 @@ def run_command(args, cwd=None): use_shell = sys.platform == "win32" try: p = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd, shell=use_shell) - except EnvironmentError as e: # if this gives a SyntaxError, note that Tahoe-LAFS requires Python 2.6+ + except EnvironmentError as e: # if this gives a SyntaxError, note that Tahoe-LAFS requires Python 2.7+ print("Warning: unable to run %r." % (" ".join(args),)) print(e) return None