From: Zooko O'Whielacronx Date: Wed, 9 Jun 2010 05:05:42 +0000 (-0700) Subject: setup: move the mock library from install_requires to tests_require (re: #1016) X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/file/URI:LIT:krugkidfnzsc4/%3C?a=commitdiff_plain;h=28ed28a0c221bbc32ea08e389f37cd14b982a178;p=tahoe-lafs%2Ftahoe-lafs.git setup: move the mock library from install_requires to tests_require (re: #1016) --- diff --git a/_auto_deps.py b/_auto_deps.py index aabda816..d6bf6a4d 100644 --- a/_auto_deps.py +++ b/_auto_deps.py @@ -32,10 +32,6 @@ install_requires=[ "pycrypto >= 2.0.1", "pyasn1 >= 0.0.8a", - # Mock - Mocking and Testing Library - # http://www.voidspace.org.uk/python/mock/ - "mock", - # Will be needed to test web apps, but not yet. See #1001. #"windmill >= 1.3", ] diff --git a/setup.py b/setup.py index bdbbbbd0..26d09b0c 100644 --- a/setup.py +++ b/setup.py @@ -134,6 +134,12 @@ if "--reporter=bwverbose-coverage" in sys.argv: if "sdist_dsc" in sys.argv: setup_requires.append('stdeb >= 0.3') +tests_require=[ + # Mock - Mocking and Testing Library + # http://www.voidspace.org.uk/python/mock/ + "mock", + ] + class ShowSupportLib(Command): user_options = [] def initialize_options(self): @@ -365,6 +371,7 @@ setup(name=APPNAME, classifiers=trove_classifiers, test_suite="allmydata.test", install_requires=install_requires, + tests_require=tests_require, include_package_data=True, setup_requires=setup_requires, entry_points = { 'console_scripts': [ 'tahoe = allmydata.scripts.runner:run' ] },