]>
Commit | Line | Data |
---|---|---|
0b211bb2 JB |
1 | --- SQLAlchemy-1.2.7/setup.py.orig 2018-04-20 22:27:50.000000000 +0200 |
2 | +++ SQLAlchemy-1.2.7/setup.py 2018-05-26 11:23:38.674698725 +0200 | |
3 | @@ -81,7 +81,7 @@ | |
4 | # not working at the time of this comment. | |
5 | user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")] | |
6 | ||
7 | - default_options = ["-n", "4", "-q", "--nomemory"] | |
8 | + default_options = ["-q", "--nomemory"] | |
9 | ||
10 | def initialize_options(self): | |
11 | TestCommand.initialize_options(self) | |
12 | @@ -121,6 +121,13 @@ | |
13 | readme = r_file.read() | |
14 | ||
15 | ||
16 | +def get_mock_dep(): | |
17 | + try: | |
18 | + from unittest import mock | |
19 | + return [] | |
20 | + except ImportError: | |
21 | + return ['mock'] | |
22 | + | |
23 | def run_setup(with_cext): | |
24 | kwargs = {} | |
25 | if with_cext: | |
26 | @@ -139,7 +146,7 @@ | |
27 | package_dir={'': 'lib'}, | |
28 | license="MIT License", | |
29 | cmdclass=cmdclass, | |
30 | - tests_require=['pytest >= 2.5.2', 'mock', 'pytest-xdist'], | |
31 | + tests_require=['pytest >= 2.5.2', 'pytest-xdist'] + get_mock_dep(), | |
32 | long_description=readme, | |
33 | classifiers=[ | |
34 | "Development Status :: 5 - Production/Stable", |