diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-20 16:52:16 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-20 16:52:16 +0200 |
commit | de375e60a5807a82b39be10c3682e45a94f24783 (patch) | |
tree | bf7337ddf81e8382bd3963c68e3660c7b7e79557 /coin_build_instructions.py | |
parent | 6d5ca98cad443cc3d10e28262d9a05ff47ba660a (diff) | |
parent | 1aae4a386f21f318340396af7dc50908e86af7f0 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'coin_build_instructions.py')
-rw-r--r-- | coin_build_instructions.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index d094d5b2a..9a7d6272c 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -101,7 +101,7 @@ def call_setup(python_ver): rmtree(_env, True) run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") - install_pip_dependencies(env_pip, ["numpy", "setuptools", "sphinx", "six"]) + install_pip_dependencies(env_pip, ["pip", "numpy", "setuptools", "sphinx", "six"]) install_pip_wheel_package(env_pip) cmd = [env_python, "-u", "setup.py"] @@ -116,8 +116,6 @@ def call_setup(python_ver): "--verbose-build"] if python_ver == "3": cmd += ["--limited-api=yes"] - else: - cmd += ["--skip-docs"] # 1.4.2019: errors in sphinx_build on openSUSE 4.2 if is_snapshot_build(): cmd += ["--snapshot-build"] |