Merge pull request #37 from scikit-build/36-support-running-as-module

Add support for running ninja as python module

Author: jcfr

.circleci/config.yml

@@ -28,12 +28,12 @@ references:
 
   x64_build_job: &x64_build_job
     docker:
-      - image: dockcross/manylinux-x64
+      - image: dockcross/manylinux1-x64
     <<: *ci_steps
 
   x86_build_job: &x86_build_job
     docker:
-      - image: dockcross/manylinux-x86
+      - image: dockcross/manylinux1-x86
     <<: *ci_steps
 
   no_filters: &no_filters

.travis.yml

@@ -11,20 +11,38 @@ matrix:
     - os: osx
       language: generic
       env:
-        - PYTHON_VERSION=3.7.2
+        - PYTHON_VERSION=3.7.8
 
     - os: osx
       language: generic
       env:
         - PYTHON_VERSION=2.7.15
 
+before_cache:
+  # Cleanup to avoid the cache to grow indefinitely as new package versions are released
+  # see https://stackoverflow.com/questions/39930171/cache-brew-builds-with-travis-ci
+  - brew cleanup
+
 cache:
   directories:
-    - $HOME/.pyenv/versions/3.7.2
+    # Cache downloaded bottles
+    - $HOME/Library/Caches/Homebrew
+    # pyenv
+    - $HOME/.pyenv_cache
+    - $HOME/.pyenv/versions/3.7.8
     - $HOME/.pyenv/versions/2.7.15
+    # scikit-ci-addons
     - $HOME/downloads
 
 before_install:
+  - |
+    # Workaround the following error occuring because python installation is cached but gettext dependency is not
+    #   dyld: Library not loaded: /usr/local/opt/gettext/lib/libintl.8.dylib
+    #     Referenced from: /Users/travis/.pyenv/versions/3.7.2/bin/python
+    #     Reason: Incompatible library version: python requires version 11.0.0 or later, but libintl.8.dylib provides version 10.0.0
+    if [[ "$TRAVIS_OS_NAME" == "osx" && "${PYTHON_VERSION}" == "3.7.8" ]]; then
+      brew install gettext
+    fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir $HOME/bin; ln -s $(which pip2) $HOME/bin/pip; ln -s $(which python2) $HOME/bin/python; fi
   - python -m pip install --disable-pip-version-check --upgrade pip
   - pip install -U scikit-ci scikit-ci-addons

ninja/__main__.py

@@ -0,0 +1,4 @@
+from ninja import ninja
+
+if __name__ == '__main__':
+    ninja()

requirements-dev.txt

@@ -10,5 +10,5 @@ scikit-build>=0.10.0
 setuptools>=28.0.0
 twine
 virtualenv>=15.0.3
-wheel==0.31.1
+wheel>=0.34
 wheeltools

scikit-ci.yml

@@ -51,7 +51,7 @@ build:
     commands:
       - |
         # Since there are no external shared libraries to bundle into the wheels
-        # this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
+        # this step will fixup the wheel switching from 'linux' to 'manylinux' tag
         for whl in dist/*$(python -c "import wheel.pep425tags as w; print(w.get_platform())").whl; do
             auditwheel repair $whl -w ./dist/
             rm $whl

tests/test_ninja.py

@@ -1,5 +1,7 @@
 
 import pytest
+import subprocess
+import sys
 
 import ninja
 
@@ -16,3 +18,7 @@ def _run(program, args):
 
 def test_ninja_module():
     _run("ninja", ["--version"])
+
+
+def test_ninja_package():
+    subprocess.check_call([sys.executable, "-m", "ninja", "--version"])