summaryrefslogtreecommitdiff
path: root/numpy/distutils/misc_util.py
diff options
context:
space:
mode:
authorJulian Taylor <jtaylor.debian@googlemail.com>2015-07-16 21:08:59 +0200
committerJulian Taylor <jtaylor.debian@googlemail.com>2015-07-16 21:10:21 +0200
commit7b0b5d1219f8869857db778032dc417aea89eb9f (patch)
tree4e6b04c01035508fb3512df1003b2e185f1e9840 /numpy/distutils/misc_util.py
parent49617ac803dfe6f9542410045854203018602b18 (diff)
downloadnumpy-7b0b5d1219f8869857db778032dc417aea89eb9f.tar.gz
MAINT: adapt parallel build option names to python3.5
python3.5 uses --parallel instead of --jobs
Diffstat (limited to 'numpy/distutils/misc_util.py')
-rw-r--r--numpy/distutils/misc_util.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 19103f2c1..75d864c5a 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -68,8 +68,8 @@ class InstallableLib(object):
def get_num_build_jobs():
"""
- Get number of parallel build jobs set by the --jobs command line argument
- of setup.py
+ Get number of parallel build jobs set by the --parallel command line
+ argument of setup.py
If the command did not receive a setting the environment variable
NPY_NUM_BUILD_JOBS checked and if that is unset it returns 1.
@@ -87,9 +87,9 @@ def get_num_build_jobs():
return envjobs
# any of these three may have the job set, take the largest
- cmdattr = (getattr(dist.get_command_obj('build'), 'jobs', None),
- getattr(dist.get_command_obj('build_ext'), 'jobs', None),
- getattr(dist.get_command_obj('build_clib'), 'jobs', None))
+ cmdattr = (getattr(dist.get_command_obj('build'), 'parallel', None),
+ getattr(dist.get_command_obj('build_ext'), 'parallel', None),
+ getattr(dist.get_command_obj('build_clib'), 'parallel', None))
if all(x is None for x in cmdattr):
return envjobs
else: