Skip to content

Commit bcd451e

Browse files
jcfrjcfr
authored
Merge pull request scikit-build#68 from AliAskari/update-to-cmake-3.14.3
update to CMake 3.14.3
2 parents 32412e1 + 2a7966c commit bcd451e

11 files changed

+119
-85
lines changed

Diff for: ‎.circleci/config.yml

+42-42
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ references:
2828

2929
x64_build_job: &x64_build_job
3030
docker:
31-
- image: dockcross/manylinux-x64
31+
- image: dockcross/manylinux2010-x64
3232
<<: *ci_steps
3333

34-
x86_build_job: &x86_build_job
35-
docker:
36-
- image: dockcross/manylinux-x86
37-
<<: *ci_steps
34+
# x86_build_job: &x86_build_job
35+
# docker:
36+
# - image: dockcross/manylinux2010-x86
37+
# <<: *ci_steps
3838

3939
no_filters: &no_filters
4040
filters:
@@ -58,18 +58,18 @@ jobs:
5858
<<: *x64_build_job
5959

6060
# x86
61-
manylinux-x86_cp27-cp27m:
62-
<<: *x86_build_job
63-
manylinux-x86_cp27-cp27mu:
64-
<<: *x86_build_job
65-
manylinux-x86_cp34-cp34m:
66-
<<: *x86_build_job
67-
manylinux-x86_cp35-cp35m:
68-
<<: *x86_build_job
69-
manylinux-x86_cp36-cp36m:
70-
<<: *x86_build_job
71-
manylinux-x86_cp37-cp37m:
72-
<<: *x86_build_job
61+
# manylinux-x86_cp27-cp27m:
62+
# <<: *x86_build_job
63+
# manylinux-x86_cp27-cp27mu:
64+
# <<: *x86_build_job
65+
# manylinux-x86_cp34-cp34m:
66+
# <<: *x86_build_job
67+
# manylinux-x86_cp35-cp35m:
68+
# <<: *x86_build_job
69+
# manylinux-x86_cp36-cp36m:
70+
# <<: *x86_build_job
71+
# manylinux-x86_cp37-cp37m:
72+
# <<: *x86_build_job
7373

7474
deploy-master:
7575
docker:
@@ -116,18 +116,18 @@ workflows:
116116
- manylinux-x64_cp37-cp37m_upload-sdist:
117117
<<: *no_filters
118118
# x86
119-
- manylinux-x86_cp27-cp27m:
120-
<<: *no_filters
121-
- manylinux-x86_cp27-cp27mu:
122-
<<: *no_filters
123-
- manylinux-x86_cp34-cp34m:
124-
<<: *no_filters
125-
- manylinux-x86_cp35-cp35m:
126-
<<: *no_filters
127-
- manylinux-x86_cp36-cp36m:
128-
<<: *no_filters
129-
- manylinux-x86_cp37-cp37m:
130-
<<: *no_filters
119+
# - manylinux-x86_cp27-cp27m:
120+
# <<: *no_filters
121+
# - manylinux-x86_cp27-cp27mu:
122+
# <<: *no_filters
123+
# - manylinux-x86_cp34-cp34m:
124+
# <<: *no_filters
125+
# - manylinux-x86_cp35-cp35m:
126+
# <<: *no_filters
127+
# - manylinux-x86_cp36-cp36m:
128+
# <<: *no_filters
129+
# - manylinux-x86_cp37-cp37m:
130+
# <<: *no_filters
131131

132132
- deploy-master:
133133
requires:
@@ -139,12 +139,12 @@ workflows:
139139
- manylinux-x64_cp36-cp36m
140140
- manylinux-x64_cp37-cp37m_upload-sdist
141141
# x86
142-
- manylinux-x86_cp27-cp27m
143-
- manylinux-x86_cp27-cp27mu
144-
- manylinux-x86_cp34-cp34m
145-
- manylinux-x86_cp35-cp35m
146-
- manylinux-x86_cp36-cp36m
147-
- manylinux-x86_cp37-cp37m
142+
# - manylinux-x86_cp27-cp27m
143+
# - manylinux-x86_cp27-cp27mu
144+
# - manylinux-x86_cp34-cp34m
145+
# - manylinux-x86_cp35-cp35m
146+
# - manylinux-x86_cp36-cp36m
147+
# - manylinux-x86_cp37-cp37m
148148
filters:
149149
branches:
150150
only: master
@@ -158,14 +158,14 @@ workflows:
158158
- manylinux-x64_cp36-cp36m
159159
- manylinux-x64_cp37-cp37m_upload-sdist
160160
# x86
161-
- manylinux-x86_cp27-cp27m
162-
- manylinux-x86_cp27-cp27mu
163-
- manylinux-x86_cp34-cp34m
164-
- manylinux-x86_cp35-cp35m
165-
- manylinux-x86_cp36-cp36m
166-
- manylinux-x86_cp37-cp37m
161+
# - manylinux-x86_cp27-cp27m
162+
# - manylinux-x86_cp27-cp27mu
163+
# - manylinux-x86_cp34-cp34m
164+
# - manylinux-x86_cp35-cp35m
165+
# - manylinux-x86_cp36-cp36m
166+
# - manylinux-x86_cp37-cp37m
167167
filters:
168168
tags:
169169
only: /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/
170170
branches:
171-
ignore: /.*/
171+
ignore: /.*/

Diff for: ‎.travis.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ matrix:
1111
- os: osx
1212
language: generic
1313
env:
14-
- PYTHON_VERSION=3.7.0
14+
- PYTHON_VERSION=3.7.2
1515

1616
- os: osx
1717
language: generic
1818
env:
19-
- PYTHON_VERSION=3.6.5
19+
- PYTHON_VERSION=3.6.8
2020

2121
- os: osx
2222
language: generic
2323
env:
24-
- PYTHON_VERSION=3.5.5
24+
- PYTHON_VERSION=3.5.6
2525

2626
- os: osx
2727
language: generic
2828
env:
29-
- PYTHON_VERSION=3.4.8
29+
- PYTHON_VERSION=3.4.9
3030

3131
- os: osx
3232
language: generic
@@ -35,10 +35,10 @@ matrix:
3535

3636
cache:
3737
directories:
38-
- $HOME/.pyenv/versions/3.7.0
39-
- $HOME/.pyenv/versions/3.6.5
40-
- $HOME/.pyenv/versions/3.5.5
41-
- $HOME/.pyenv/versions/3.4.8
38+
- $HOME/.pyenv/versions/3.7.2
39+
- $HOME/.pyenv/versions/3.6.8
40+
- $HOME/.pyenv/versions/3.5.6
41+
- $HOME/.pyenv/versions/3.4.9
4242
- $HOME/.pyenv/versions/2.7.15
4343
- $HOME/downloads
4444

Diff for: ‎CMakeLists.txt

+14-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(CMakePythonDistributions_SUPERBUILD)
3131
endif()
3232
option(BUILD_CMAKE_FROM_SOURCE "Build CMake from source" ${default})
3333

34-
option(BUILD_VERBOSE "Build reporting additional information (e.g download progress, ...)" OFF)
34+
option(BUILD_VERBOSE "Build reporting additional information (e.g download progress, ...)" ON)
3535

3636
set(CMakePythonDistributions_ARCHIVE_DOWNLOAD_DIR "${CMAKE_BINARY_DIR}"
3737
CACHE PATH "Directory where to download archives"
@@ -169,6 +169,19 @@ if(CMakePythonDistributions_SUPERBUILD)
169169
)
170170
message(STATUS "SuperBuild - CMakeProject-build - OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
171171
endif()
172+
foreach(var_name IN ITEMS
173+
CMAKE_BUILD_PARALLEL_LEVEL
174+
CMAKE_JOB_POOLS
175+
CMAKE_JOB_POOL_COMPILE
176+
CMAKE_JOB_POOL_LINK
177+
)
178+
if(DEFINED ${var_name})
179+
list(APPEND _cmake_cache_args
180+
-D${var_name}:STRING=${${var_name}}
181+
)
182+
message(STATUS "SuperBuild - CMakeProject-build - ${var_name}: ${${var_name}}")
183+
endif()
184+
endforeach()
172185

173186
ExternalProject_add(CMakeProject-build
174187
SOURCE_DIR ${CMakeProject_SOURCE_DIR}

Diff for: ‎CMakeUrls.cmake

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11

22
#-----------------------------------------------------------------------------
33
# CMake sources
4-
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3.tar.gz")
5-
set(unix_source_sha256 "665f905036b1f731a2a16f83fb298b1fb9d0f98c382625d023097151ad016b25")
4+
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3.tar.gz")
5+
set(unix_source_sha256 "215d0b64e81307182b29b63e562edf30b3875b834efdad09b3fcb5a7d2f4b632")
66

7-
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3.zip")
8-
set(windows_source_sha256 "4de19b7f74e7de444df710423bb04dcf3da01bc31ba9b867fc04c77d88ce44b6")
7+
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3.zip")
8+
set(windows_source_sha256 "06c0ea5d486d5b837daa50c0bf76f2d375e1053790942ea78c42c5f8bb56aa62")
99

1010
#-----------------------------------------------------------------------------
1111
# CMake binaries
1212

1313
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
1414
set(linux32_binary_sha256 "NA")
1515

16-
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-Linux-x86_64.tar.gz")
17-
set(linux64_binary_sha256 "78227de38d574d4d19093399fd4b40a4fb0a76cbfc4249783a969652ce515270")
16+
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-Linux-x86_64.tar.gz")
17+
set(linux64_binary_sha256 "29faa62fb3a0b6323caa3d9557e1a5f1205614c0d4c5c2a9917f16a74f7eff68")
1818

19-
set(macosx_binary_url "https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-Darwin-x86_64.tar.gz")
20-
set(macosx_binary_sha256 "cee923ec7a88350f78dac06f0dfae5dec3c9cef331686acfd36ef7dd5aea84db")
19+
set(macosx_binary_url "https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-Darwin-x86_64.tar.gz")
20+
set(macosx_binary_sha256 "3672bdf0aa492c6f1061f3c2d6ae670c3f6ac1eca56a3d6ed5dbe749e2b5a9c9")
2121

22-
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-win32-x86.zip")
23-
set(win32_binary_sha256 "1382a32494b49d0554268a6d4c321865ace7e66c9189323c4f43630f067cf135")
22+
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-win32-x86.zip")
23+
set(win32_binary_sha256 "1a2d8ffdb63d3b53fe3a93e378ce2e4a36656bdce015cc3e561920e406ebf497")
2424

25-
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-win64-x64.zip")
26-
set(win64_binary_sha256 "6edc6686cd29572984497bb14de338b496604b5029c75321bf559d47664b38ab")
25+
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-win64-x64.zip")
26+
set(win64_binary_sha256 "53856665d3302aca1684e20eaf423062ab192665a9714a27b10f2d6cd01f3454")

Diff for: ‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The suite of CMake tools were created by Kitware in response to the need
1111
for a powerful, cross-platform build environment for open-source projects
1212
such as ITK and VTK.
1313

14-
The CMake python wheels provide `CMake 3.13.3 <https://cmake.org/cmake/help/v3.13/index.html>`_.
14+
The CMake python wheels provide `CMake 3.14.3 <https://cmake.org/cmake/help/v3.14/index.html>`_.
1515

1616
Latest Release
1717
--------------

Diff for: ‎appveyor.yml

+20-13
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,62 @@ version: "0.0.1.{build}"
88
environment:
99
matrix:
1010

11-
- PYTHON_DIR: "C:\\Python27"
11+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
12+
PYTHON_DIR: "C:\\Python27"
1213
PYTHON_VERSION: "2.7.x"
1314
PYTHON_ARCH: "32"
1415
BLOCK: "0"
1516

16-
- PYTHON_DIR: "C:\\Python27-x64"
17+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
18+
PYTHON_DIR: "C:\\Python27-x64"
1719
PYTHON_VERSION: "2.7.x"
1820
PYTHON_ARCH: "64"
1921
BLOCK: "0"
2022

21-
- PYTHON_DIR: "C:\\Python34"
23+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
24+
PYTHON_DIR: "C:\\Python34"
2225
PYTHON_VERSION: "3.4.x"
2326
PYTHON_ARCH: "32"
2427
BLOCK: "0"
2528

26-
- PYTHON_DIR: "C:\\Python34-x64"
29+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
30+
PYTHON_DIR: "C:\\Python34-x64"
2731
PYTHON_VERSION: "3.4.x"
2832
PYTHON_ARCH: "64"
2933
BLOCK: "0"
3034

31-
- PYTHON_DIR: "C:\\Python35"
35+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
36+
PYTHON_DIR: "C:\\Python35"
3237
PYTHON_VERSION: "3.5.x"
3338
PYTHON_ARCH: "32"
3439
BLOCK: "0"
3540

36-
- PYTHON_DIR: "C:\\Python35-x64"
41+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
42+
PYTHON_DIR: "C:\\Python35-x64"
3743
PYTHON_VERSION: "3.5.x"
3844
PYTHON_ARCH: "64"
3945
BLOCK: "0"
4046

41-
- PYTHON_DIR: "C:\\Python36"
47+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
48+
PYTHON_DIR: "C:\\Python36"
4249
PYTHON_VERSION: "3.6.x"
4350
PYTHON_ARCH: "32"
4451
BLOCK: "0"
4552

46-
- PYTHON_DIR: "C:\\Python36-x64"
53+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
54+
PYTHON_DIR: "C:\\Python36-x64"
4755
PYTHON_VERSION: "3.6.x"
4856
PYTHON_ARCH: "64"
4957
BLOCK: "0"
5058

51-
- PYTHON_DIR: "C:\\Python37"
59+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
60+
PYTHON_DIR: "C:\\Python37"
5261
PYTHON_VERSION: "3.7.x"
5362
PYTHON_ARCH: "64"
5463
BLOCK: "0"
5564

56-
- PYTHON_DIR: "C:\\Python37-x64"
65+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
66+
PYTHON_DIR: "C:\\Python37-x64"
5767
PYTHON_VERSION: "3.7.x"
5868
PYTHON_ARCH: "64"
5969
BLOCK: "0"
@@ -63,9 +73,6 @@ environment:
6373
PYPI_PASSWORD:
6474
secure: qDoPKmtLMdcKUKRHuTlfaajjzO4Q4yu25FM5JuB7z84=
6575

66-
cache:
67-
- C:\\cmake-3.6.2
68-
6976
init:
7077
- python -m pip install -U scikit-ci scikit-ci-addons
7178
- python -m ci_addons --install ../addons

Diff for: ‎cmake/__init__.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,23 @@
1010

1111
CMAKE_DATA = os.path.join(os.path.dirname(__file__), 'data')
1212

13+
1314
# Support running tests from the source tree
1415
if not os.path.exists(CMAKE_DATA):
1516
from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR
17+
from skbuild.constants import set_skbuild_plat_name
18+
19+
if platform.system().lower() == "darwin":
20+
# Since building the project specifying --plat-name or CMAKE_OSX_* variables
21+
# leads to different SKBUILD_DIR, the code below attempt to guess the most
22+
# likely plat-name.
23+
_skbuild_dirs = os.listdir(os.path.join(os.path.dirname(__file__), '..', '_skbuild'))
24+
if _skbuild_dirs:
25+
_likely_plat_name = '-'.join(_skbuild_dirs[0].split('-')[:3])
26+
set_skbuild_plat_name(_likely_plat_name)
27+
1628
_cmake_data = os.path.abspath(os.path.join(
17-
os.path.dirname(__file__), '..', SKBUILD_CMAKE_INSTALL_DIR, 'cmake/data'))
29+
os.path.dirname(__file__), '..', SKBUILD_CMAKE_INSTALL_DIR(), 'cmake/data'))
1830
if os.path.exists(_cmake_data):
1931
CMAKE_DATA = _cmake_data
2032

Diff for: ‎docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The suite of CMake tools were created by Kitware in response to the need
1515
for a powerful, cross-platform build environment for open-source projects
1616
such as `ITK <https://www.itk.org>`_ and `VTK <http://www.vtk.org>`_.
1717

18-
The CMake python wheels provide `CMake 3.13.3 <https://cmake.org/cmake/help/v3.13/index.html>`_.
18+
The CMake python wheels provide `CMake 3.14.3 <https://cmake.org/cmake/help/v3.14/index.html>`_.
1919

2020
.. toctree::
2121
:maxdepth: 2

Diff for: ‎requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pytest>=3.0.3
66
pytest-cov>=2.4.0
77
pytest-runner>=2.9
88
pytest-virtualenv>=1.2.5
9-
scikit-build>=0.7.1
9+
scikit-build>=0.10.0
1010
setuptools>=28.0.0
1111
twine
1212
virtualenv>=15.0.3

Diff for: ‎scikit-ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ before_install:
1111
circle:
1212
environment:
1313
PATH: /opt/python/$<MANYLINUX_PYTHON>/bin:$<PATH>
14-
SETUP_CMAKE_ARGS: -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl
14+
SETUP_CMAKE_ARGS: -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl '-DCMAKE_JOB_POOLS:STRING=compile=4;link=3' -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link
1515

1616
travis:
1717
osx:
@@ -26,6 +26,7 @@ install:
2626
commands:
2727
- python -c "import sys; print(sys.version)"
2828
- python -m pip install --disable-pip-version-check --upgrade pip
29+
- pip install pytest-virtualenv -f https://github.com/jcfr/pytest-plugins/releases/tag/v1.7.0.dev15 --pre
2930
- pip install -r requirements-dev.txt
3031

3132
before_build:
@@ -50,9 +51,10 @@ build:
5051
commands:
5152
- |
5253
# Since there are no external shared libraries to bundle into the wheels
53-
# this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
54-
for whl in dist/*$(python -c "import wheel.pep425tags as w; print(w.get_platform())").whl; do
55-
auditwheel repair $whl -w ./dist/
54+
# this step will fixup the wheel switching from 'linux' to 'manylinux2010' tag
55+
arch=$(python -c "import sys;print('x86_64' if sys.maxsize > 2**32 else 'i686')")
56+
for whl in dist/*linux_${arch}.whl; do
57+
auditwheel repair --plat "manylinux2010_${arch}" $whl -w ./dist/
5658
rm $whl
5759
done
5860

0 commit comments

Comments
 (0)