Skip to content

Commit 9d5c210

Browse files
committed
Update setup.py
- Point to python-future.org as canonical URL - Add lists of packages required for installation and testing on Py2.6
1 parent 264f9bc commit 9d5c210

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

TESTING.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
Currently the tests are passing on OS X on Python 2.6, 2.7 and 3.3.
1+
Currently the tests are passing on OS X and Linux on Python 2.6, 2.7, 3.3 and 3.4.
22

3-
On Linux they are currently failing with ImportErrors for test.support when the
4-
test suite is run with:
3+
The test suite can be run either with:
54

65
$ python setup.py test
76

8-
which uses the unittest module's test discovery mechanism.
9-
10-
These same tests pass when running the test suite with:
7+
which uses the unittest module's test discovery mechanism, or with:
118

129
$ py.test

setup.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,22 @@
8181
'futurize.py',
8282
'pasteurize.py',
8383
'discover_tests.py',
84-
'check_rst.sh'
84+
'check_rst.sh',
85+
'TESTING.txt',
8586
]}
8687
REQUIRES = []
88+
TEST_REQUIRES = []
89+
if sys.version_info[:2] == (2, 6):
90+
REQUIRES += ['importlib', 'argparse']
91+
TEST_REQUIRES += ['unittest2']
8792
VERSION = future.__version__
8893
DESCRIPTION = "Clean single-source support for Python 3 and 2"
8994
LONG_DESC = future.__doc__
9095
AUTHOR = "Ed Schofield"
9196
AUTHOR_EMAIL = "ed@pythoncharmers.com"
92-
URL="https://github.com/PythonCharmers/python-future"
97+
URL="https://python-future.org"
9398
LICENSE = "MIT"
94-
KEYWORDS = "future python3 migration backport six 2to3 futurize modernize past pasteurize"
99+
KEYWORDS = "future past python3 migration futurize backport six 2to3 modernize pasteurize 3to2"
95100
CLASSIFIERS = [
96101
"Programming Language :: Python",
97102
"Programming Language :: Python :: 2.6",
@@ -107,6 +112,7 @@
107112

108113
setup_kwds = {}
109114

115+
110116
setup(name=NAME,
111117
version=VERSION,
112118
author=AUTHOR,
@@ -128,5 +134,6 @@
128134
install_requires=REQUIRES,
129135
classifiers=CLASSIFIERS,
130136
test_suite = "discover_tests",
137+
tests_require=TEST_REQUIRES,
131138
**setup_kwds
132139
)

0 commit comments

Comments
 (0)