ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-22 06:17:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #206 from leif/python27

Browse Source 
drop Python 2.6 (.travis.yml, doc, setup.py)
This commit is contained in:
Daira Hopwood 2015-12-03 01:05:08 +00:00
commit 45ec92418a
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -2,7 +2,6 @@ sudo: false
language: python language: python
python: python:
- "2.7" - "2.7"
- "2.6"
- "pypy" - "pypy"
before_install: before_install:
- sh -c set - sh -c set

14
docs/quickstart.rst
View File

@ -31,13 +31,13 @@ Install Python
-------------- --------------
Check if you already have an adequate version of Python installed by running 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 ``python -V``. The latest version of Python v2.7 is recommended. Python v2.6.x
will work. Python v3 does not work. On Windows, we recommend the use of is no longer officially supported, but might still work. Python v3 does not
native Python v2.7, not Cygwin Python. If you don't have one of these work. On Windows, we recommend the use of native Python v2.7, not Cygwin
versions of Python installed, `download`_ and install the latest version of Python. If you don't have one of these versions of Python installed,
Python v2.7. Make sure that the path to the installation directory has no `download`_ and install the latest version of Python v2.7. Make sure that the
spaces in it (e.g. on Windows, do not install Python in the "Program Files" path to the installation directory has no spaces in it (e.g. on Windows, do not
directory). install Python in the "Program Files" directory).
.. _download: https://www.python.org/downloads/ .. _download: https://www.python.org/downloads/

5
setup.py
View File

@ -1,6 +1,6 @@
#! /usr/bin/env python #! /usr/bin/env python
# -*- coding: utf-8 -*- # -*- 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 # Tahoe-LAFS -- secure, distributed storage grid
# #
@ -101,7 +101,6 @@ trove_classifiers=[
"Programming Language :: C", "Programming Language :: C",
"Programming Language :: Python", "Programming Language :: Python",
"Programming Language :: Python :: 2", "Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7", "Programming Language :: Python :: 2.7",
"Topic :: Utilities", "Topic :: Utilities",
"Topic :: System :: Systems Administration", "Topic :: System :: Systems Administration",
@ -249,7 +248,7 @@ def run_command(args, cwd=None):
use_shell = sys.platform == "win32" use_shell = sys.platform == "win32"
try: try:
p = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd, shell=use_shell) 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("Warning: unable to run %r." % (" ".join(args),))
print(e) print(e)
return None return None