Merge pull request scikit-build#38 from scikit-build/update-to-circleci-v2

jcfr · web-flow · commit f701056ccb44 · 2018-07-09T22:56:28.000Z
Switch to CircleCI 2.0
diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,85 @@
+ci-steps: &ci-steps
+  working_directory: /work
+  steps:
+  - checkout
+  - run:
+      name:
+      command: |
+        export MANYLINUX_PYTHON=$(echo ${CIRCLE_JOB} | cut -d"_" -f2)
+        echo "MANYLINUX_PYTHON [${MANYLINUX_PYTHON}]"
+        /opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci
+        /opt/python/${MANYLINUX_PYTHON}/bin/ci
+
+version: 2
+jobs:
+  #
+  # x64
+  #
+  manylinux-x64_cp27-cp27m:
+    docker:
+      - image: dockcross/manylinux-x64
+    <<: *ci-steps
+
+  manylinux-x64_cp27-cp27mu:
+    docker:
+      - image: dockcross/manylinux-x64
+    <<: *ci-steps
+
+  manylinux-x64_cp34-cp34m:
+    docker:
+      - image: dockcross/manylinux-x64
+    <<: *ci-steps
+
+  manylinux-x64_cp35-cp35m:
+    docker:
+      - image: dockcross/manylinux-x64
+    <<: *ci-steps
+
+  manylinux-x64_cp36-cp36m:
+    docker:
+      - image: dockcross/manylinux-x64
+    <<: *ci-steps
+  #
+  # x86
+  #
+  manylinux-x86_cp27-cp27m:
+    docker:
+      - image: dockcross/manylinux-x86
+    <<: *ci-steps
+
+  manylinux-x86_cp27-cp27mu:
+    docker:
+      - image: dockcross/manylinux-x86
+    <<: *ci-steps
+
+  manylinux-x86_cp34-cp34m:
+    docker:
+      - image: dockcross/manylinux-x86
+    <<: *ci-steps
+
+  manylinux-x86_cp35-cp35m:
+    docker:
+      - image: dockcross/manylinux-x86
+    <<: *ci-steps
+
+  manylinux-x86_cp36-cp36m:
+    docker:
+      - image: dockcross/manylinux-x86
+    <<: *ci-steps
+
+
+workflows:
+  version: 2
+  build-test-deploy:
+    jobs:
+      - manylinux-x64_cp27-cp27m
+      - manylinux-x64_cp27-cp27mu
+      - manylinux-x64_cp34-cp34m
+      - manylinux-x64_cp35-cp35m
+      - manylinux-x64_cp36-cp36m
+
+      - manylinux-x86_cp27-cp27m
+      - manylinux-x86_cp27-cp27mu
+      - manylinux-x86_cp34-cp34m
+      - manylinux-x86_cp35-cp35m
+      - manylinux-x86_cp36-cp36m
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
 # This project
-cmake/resources/*
-src
 archive-cache
+cmake/resources/*
+env.json
 skbuild
+src
 standalone-build
 standalone-x86-build
 standalone-x64-build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,6 +148,14 @@ if(CMakePythonDistributions_SUPERBUILD)
     if(NOT DEFINED CMakeProject_BINARY_DIR)
       set(CMakeProject_BINARY_DIR ${CMAKE_BINARY_DIR}/CMakeProject-build)
 
+      set(_cmake_cache_args)
+      if(DEFINED OPENSSL_ROOT_DIR)
+        list(APPEND _cmake_cache_args
+          -DOPENSSL_ROOT_DIR:PATH=${OPENSSL_ROOT_DIR}
+          )
+        message(STATUS "SuperBuild -   CMakeProject-build - OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
+      endif()
+
       ExternalProject_add(CMakeProject-build
         SOURCE_DIR ${CMakeProject_SOURCE_DIR}
         BINARY_DIR ${CMakeProject_BINARY_DIR}
@@ -160,6 +168,7 @@ if(CMakePythonDistributions_SUPERBUILD)
           -DBUILD_TESTING:BOOL=OFF
           -DCMake_INSTALL_DEPENDENCIES:BOOL=ON
           -DCMAKE_INSTALL_MESSAGE:STRING=NEVER
+          ${_cmake_cache_args}
         USES_TERMINAL_CONFIGURE 1
         USES_TERMINAL_BUILD 1
         ${ep_log_configure_build_args}
@@ -228,6 +237,7 @@ if(CMakePythonDistributions_SUPERBUILD)
       -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
       ${${PROJECT_NAME}_CMAKE_CACHE_ARG}
     USES_TERMINAL_CONFIGURE 1
+    USES_TERMINAL_BUILD 1
     INSTALL_COMMAND ""
     DEPENDS
       ${${PROJECT_NAME}_DEPENDS}
diff --git a/circle.yml b/circle.yml
diff --git a/cmake/__init__.py b/cmake/__init__.py
@@ -12,8 +12,9 @@
 
 # Support running tests from the source tree
 if not os.path.exists(CMAKE_DATA):
+    from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR
     _cmake_data = os.path.abspath(os.path.join(
-        os.path.dirname(__file__), '../_skbuild/cmake-install/cmake/data'))
+        os.path.dirname(__file__), '..', SKBUILD_CMAKE_INSTALL_DIR, 'cmake/data'))
     if os.path.exists(_cmake_data):
         CMAKE_DATA = _cmake_data
 
diff --git a/docs/building.rst b/docs/building.rst
@@ -44,7 +44,7 @@ can successfully glob the source files.
 The source distribution is generated using the following
 command::
 
-    python setup.pt sdist
+    python setup.py sdist
 
 
 Binary distribution (build, bdist, bdist_wheel)
@@ -58,13 +58,13 @@ The project has two mode of operations:
 The binary distribution is generated using the following
 command::
 
-    python setup.pt bdist_wheel
+    python setup.py bdist_wheel
 
 
 Changing the default mode is achieved by explicitly passing the option
 to CMake::
 
- python setup.pt bdist_wheel -- -DBUILD_CMAKE_FROM_SOURCE:BOOL=ON
+ python setup.py bdist_wheel -- -DBUILD_CMAKE_FROM_SOURCE:BOOL=ON
 
 
 Default value for ``BUILD_CMAKE_FROM_SOURCE``
@@ -77,6 +77,27 @@ different default:
 - MacOSX: OFF
 - Windows: OFF
 
+Controlling verbosity
+---------------------
+
+configure and build output
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+By default, the output associated to the configure and build steps of the
+`CMakeProject-build` external project are logged into files. This can be
+changed by setting the ``BUILD_VERBOSE`` option::
+
+    python setup.py bdist_wheel -- -DBUILD_VERBOSE:BOOL=1
+
+list of files copied into the distributions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+By default, the complete list of files copied into the distributions are
+reported. This can be changed passing the ``--hide-listing`` option::
+
+    python setup.py --hide-listing sdist
+    python setup.py --hide-listing bdist_wheel
+
 Optimizations
 -------------
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -5,5 +5,5 @@ pytest>=3.0.3
 pytest-cov>=2.4.0
 pytest-runner>=2.9
 pytest-virtualenv>=1.2.5
-scikit-build>=0.5.0
+scikit-build>=0.7.1
 virtualenv>=15.0.3
diff --git a/scikit-ci.yml b/scikit-ci.yml
@@ -12,21 +12,23 @@ before_install:
   circle:
     environment:
       PATH: /opt/python/$<MANYLINUX_PYTHON>/bin:$<PATH>
+      SETUP_CMAKE_ARGS: -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl
     commands:
       - rm -rf dist/*
 
   travis:
     osx:
       environment:
         PATH: $<HOME>/.pyenv/versions/$<PYTHON_VERSION>/bin:$<PATH>
-        SETUP_ARGS: --plat-name macosx-10.6-x86_64 -- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
+        SETUP_BDIST_WHEEL_ARGS: --plat-name macosx-10.6-x86_64
+        SETUP_CMAKE_ARGS: -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
       commands:
         - python ../addons/travis/install_pyenv.py
         - python ../addons/travis/install_cmake.py 3.6.2
 
 install:
   commands:
-    - python --version
+    - python -c "import sys; print(sys.version)"
     - python -m pip install --disable-pip-version-check --upgrade pip
     - pip install -U setuptools
     - $<RUN_ENV> pip install -U -r requirements-dev.txt
@@ -37,15 +39,15 @@ before_build:
 
 build:
   commands:
-    - python setup.py --hide-listing sdist
-    - $<RUN_ENV> python setup.py --hide-listing bdist_wheel $<SETUP_ARGS>
+    - python setup.py --hide-listing sdist -- $<SETUP_CMAKE_ARGS>
+    - $<RUN_ENV> python setup.py --hide-listing bdist_wheel $<SETUP_BDIST_WHEEL_ARGS> -- $<SETUP_CMAKE_ARGS>
 
   circle:
     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
-        for whl in dist/*$(uname -p).whl; do
+        for whl in dist/*$(python -c "import wheel.pep425tags as w; print(w.get_platform())").whl; do
             auditwheel repair $whl -w ./dist/
             rm $whl
         done
diff --git a/setup.py b/setup.py
@@ -52,8 +52,8 @@ def parse_requirements(filename):
     url=r'http://cmake.org/',
     download_url=r'https://cmake.org/download',
 
-    description=r'CMake is an open-source, cross-platform family of \
-    tools designed to build, test and package software',
+    description=r'CMake is an open-source, cross-platform family of '
+                r'tools designed to build, test and package software',
 
     long_description=readme + '\n\n' + history,
 
