Skip to content

Commit 33d8c98

Browse files
committed
ci: Fix macOS build refactoring how setup.py args are passed
This commit clearly identifies CMake arguments and setuptools command arguments. This fixes error "error: option --plat-name not recognized" reported by sdist command.
1 parent 13bbd55 commit 33d8c98

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

scikit-ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ before_install:
1212
circle:
1313
environment:
1414
PATH: /opt/python/$<MANYLINUX_PYTHON>/bin:$<PATH>
15-
SETUP_ARGS: -- -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl
15+
SETUP_CMAKE_ARGS: -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl
1616
commands:
1717
- rm -rf dist/*
1818

1919
travis:
2020
osx:
2121
environment:
2222
PATH: $<HOME>/.pyenv/versions/$<PYTHON_VERSION>/bin:$<PATH>
23-
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
23+
SETUP_BDIST_WHEEL_ARGS: --plat-name macosx-10.6-x86_64
24+
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
2425
commands:
2526
- python ../addons/travis/install_pyenv.py
2627
- python ../addons/travis/install_cmake.py 3.6.2
@@ -38,8 +39,8 @@ before_build:
3839

3940
build:
4041
commands:
41-
- python setup.py --hide-listing sdist $<SETUP_ARGS>
42-
- $<RUN_ENV> python setup.py --hide-listing bdist_wheel $<SETUP_ARGS>
42+
- python setup.py --hide-listing sdist -- $<SETUP_CMAKE_ARGS>
43+
- $<RUN_ENV> python setup.py --hide-listing bdist_wheel $<SETUP_BDIST_WHEEL_ARGS> -- $<SETUP_CMAKE_ARGS>
4344

4445
circle:
4546
commands:

0 commit comments

Comments
 (0)