summaryrefslogtreecommitdiff
path: root/numpy/distutils/command
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/command
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/command')
-rw-r--r--numpy/distutils/command/build.py10
-rw-r--r--numpy/distutils/command/build_clib.py12
-rw-r--r--numpy/distutils/command/build_ext.py12
3 files changed, 17 insertions, 17 deletions
diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py
index f7249ae81..3d7101582 100644
--- a/numpy/distutils/command/build.py
+++ b/numpy/distutils/command/build.py
@@ -16,7 +16,7 @@ class build(old_build):
user_options = old_build.user_options + [
('fcompiler=', None,
"specify the Fortran compiler type"),
- ('jobs=', 'j',
+ ('parallel=', 'j',
"number of parallel jobs"),
]
@@ -28,14 +28,14 @@ class build(old_build):
def initialize_options(self):
old_build.initialize_options(self)
self.fcompiler = None
- self.jobs = None
+ self.parallel = None
def finalize_options(self):
- if self.jobs:
+ if self.parallel:
try:
- self.jobs = int(self.jobs)
+ self.parallel = int(self.parallel)
except ValueError:
- raise ValueError("--jobs/-j argument must be an integer")
+ raise ValueError("--parallel/-j argument must be an integer")
build_scripts = self.build_scripts
old_build.finalize_options(self)
plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py
index 6e65a3bfb..31229d1e0 100644
--- a/numpy/distutils/command/build_clib.py
+++ b/numpy/distutils/command/build_clib.py
@@ -30,7 +30,7 @@ class build_clib(old_build_clib):
('fcompiler=', None,
"specify the Fortran compiler type"),
('inplace', 'i', 'Build in-place'),
- ('jobs=', 'j',
+ ('parallel=', 'j',
"number of parallel jobs"),
]
@@ -40,16 +40,16 @@ class build_clib(old_build_clib):
old_build_clib.initialize_options(self)
self.fcompiler = None
self.inplace = 0
- self.jobs = None
+ self.parallel = None
def finalize_options(self):
- if self.jobs:
+ if self.parallel:
try:
- self.jobs = int(self.jobs)
+ self.parallel = int(self.parallel)
except ValueError:
- raise ValueError("--jobs/-j argument must be an integer")
+ raise ValueError("--parallel/-j argument must be an integer")
old_build_clib.finalize_options(self)
- self.set_undefined_options('build', ('jobs', 'jobs'))
+ self.set_undefined_options('build', ('parallel', 'parallel'))
def have_f_sources(self):
for (lib_name, build_info) in self.libraries:
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py
index c588204e5..d95faf5e1 100644
--- a/numpy/distutils/command/build_ext.py
+++ b/numpy/distutils/command/build_ext.py
@@ -34,7 +34,7 @@ class build_ext (old_build_ext):
user_options = old_build_ext.user_options + [
('fcompiler=', None,
"specify the Fortran compiler type"),
- ('jobs=', 'j',
+ ('parallel=', 'j',
"number of parallel jobs"),
]
@@ -46,14 +46,14 @@ class build_ext (old_build_ext):
def initialize_options(self):
old_build_ext.initialize_options(self)
self.fcompiler = None
- self.jobs = None
+ self.parallel = None
def finalize_options(self):
- if self.jobs:
+ if self.parallel:
try:
- self.jobs = int(self.jobs)
+ self.parallel = int(self.parallel)
except ValueError:
- raise ValueError("--jobs/-j argument must be an integer")
+ raise ValueError("--parallel/-j argument must be an integer")
# Ensure that self.include_dirs and self.distribution.include_dirs
# refer to the same list object. finalize_options will modify
@@ -72,7 +72,7 @@ class build_ext (old_build_ext):
self.include_dirs.extend(incl_dirs)
old_build_ext.finalize_options(self)
- self.set_undefined_options('build', ('jobs', 'jobs'))
+ self.set_undefined_options('build', ('parallel', 'parallel'))
def run(self):
if not self.extensions: