Merge pull request #277 from jcrivenaes/more-setup-tuning

Tuning setup for Equinor in-house Komodo build system

.travis.yml

@@ -81,6 +81,7 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         brew update && brew install swig;
     fi
+  - pip install pip -U
   - pip install bandit
   - pip install -r requirements_setup.txt
   - build_wheel $REPO_DIR $PLAT

pyproject.toml

@@ -9,7 +9,7 @@ requires = [
          "scikit-build",
          'cmake>=3.6.0; python_version < "3.7" and platform_system == "Linux"',
          'cmake==3.15.3; python_version >= "3.7" and platform_system == "Linux"',
-         'cmake==3.15.3; platform_system != "Linux"',
+         'cmake>=3.6.0; platform_system != "Linux"',
          "ninja",
          "setuptools_scm>=3.2.0",
          'numpy==1.10.4; python_version == "3.4"',

requirements_setup.txt

@@ -3,10 +3,12 @@ numpy==1.13.3; python_version >= "3.5" and python_version < "3.7" and platform_s
 numpy==1.16.4; python_version >= "3.7" or python_version == "2.7" or platform_system != "Linux"
 cmake==3.13.3; python_version < "3.7" and platform_system == "Linux"
 cmake==3.15.3; python_version >= "3.7" and platform_system == "Linux"
-cmake==3.15.3; platform_system != "Linux"
+cmake>=3.6.0; platform_system != "Linux"
 setuptools_scm>=3.2.0
 scikit-build==0.10.0
-ninja==1.9.0.post1
+ninja==1.8.2; python_version < "3.7" and platform_system == "Linux"
+ninja>=1.8.2; python_version >= "3.7" and platform_system == "Linux"
+ninja==1.8.2; platform_system != "Linux"
 pytest>=2.9.2
 pytest-runner>=2.11.1
 Sphinx

scripts/pyproject.toml.komodo

@@ -0,0 +1,15 @@
+# version to be runnable by older pips in Komodo bleeding (Equinor)
+[build-system]
+requires = [
+         "pip>=19.1.1",
+         "setuptools>=30.3.0",
+         "wheel",
+         "scikit-build",
+         'cmake>=3.6.0',
+         "ninja",
+         "setuptools_scm>=3.2.0",
+         'numpy>=1.10.4',
+         'Sphinx',
+         'sphinx-rtd-theme',
+         'sphinxcontrib-apidoc',
+         ]

setup.py

@@ -173,7 +173,9 @@ def swigok():
 
 
 if not swigok():
-    if "Linux" in platform.system():
+    if "SWIG_BY_KOMODO" in os.environ:
+        print("Spesial handling of swig in komodo (Equinor) setup...")
+    elif "Linux" in platform.system():
         print("Installing swig from source (tmp) ...")
         subprocess.check_call(  # nosec
             ["bash", "swig_install.sh"], cwd="scripts",