Permalink
Browse files

Update setup.py

- Point to python-future.org as canonical URL
- Add lists of packages required for installation and testing on Py2.6
  • Loading branch information...
1 parent 264f9bc commit 9d5c210219e694d2d1ed6e5c1311a4e586fd5a35 @edschofield edschofield committed Sep 30, 2014
Showing with 13 additions and 9 deletions.
  1. +3 −6 TESTING.txt
  2. +10 −3 setup.py
View
@@ -1,12 +1,9 @@
-Currently the tests are passing on OS X on Python 2.6, 2.7 and 3.3.
+Currently the tests are passing on OS X and Linux on Python 2.6, 2.7, 3.3 and 3.4.
-On Linux they are currently failing with ImportErrors for test.support when the
-test suite is run with:
+The test suite can be run either with:
$ python setup.py test
-which uses the unittest module's test discovery mechanism.
-
-These same tests pass when running the test suite with:
+which uses the unittest module's test discovery mechanism, or with:
$ py.test
View
@@ -81,17 +81,22 @@
'futurize.py',
'pasteurize.py',
'discover_tests.py',
- 'check_rst.sh'
+ 'check_rst.sh',
+ 'TESTING.txt',
]}
REQUIRES = []
+TEST_REQUIRES = []
+if sys.version_info[:2] == (2, 6):
+ REQUIRES += ['importlib', 'argparse']
+ TEST_REQUIRES += ['unittest2']
VERSION = future.__version__
DESCRIPTION = "Clean single-source support for Python 3 and 2"
LONG_DESC = future.__doc__
AUTHOR = "Ed Schofield"
AUTHOR_EMAIL = "ed@pythoncharmers.com"
-URL="https://github.com/PythonCharmers/python-future"
+URL="https://python-future.org"
LICENSE = "MIT"
-KEYWORDS = "future python3 migration backport six 2to3 futurize modernize past pasteurize"
+KEYWORDS = "future past python3 migration futurize backport six 2to3 modernize pasteurize 3to2"
CLASSIFIERS = [
"Programming Language :: Python",
"Programming Language :: Python :: 2.6",
@@ -107,6 +112,7 @@
setup_kwds = {}
+
setup(name=NAME,
version=VERSION,
author=AUTHOR,
@@ -128,5 +134,6 @@
install_requires=REQUIRES,
classifiers=CLASSIFIERS,
test_suite = "discover_tests",
+ tests_require=TEST_REQUIRES,
**setup_kwds
)

0 comments on commit 9d5c210

Please sign in to comment.