8000 enh: reorganize build files · scikit-learn/scikit-learn@4b7a0e0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4b7a0e0

Browse files
nelson-liunelson-liu
committed
enh: reorganize build files
fix: change path for building doc on circleci enh: removed useless WindowError and cythonize.dat in _build_utils init
1 parent bf9cd88 commit 4b7a0e0

16 files changed

+282
-288
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ matrix:
5959
before_install: sudo apt-get install -yqq libatlas3gf-base libatlas-dev
6060

6161

62-
install: source continuous_integration/install.sh
63-
script: bash continuous_integration/test_script.sh
64-
after_success: source continuous_integration/after_success.sh
62+
install: source build_tools/travis/install.sh
63+
script: bash build_tools/travis/test_script.sh
64+
after_success: source build_tools/travis/after_success.sh
6565
notifications:
6666
webhooks:
6767
urls:

‎appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ environment:
77
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
88
# /E:ON and /V:ON options are not enabled in the batch script interpreter
99
# See: http://stackoverflow.com/a/13751649/163740
10-
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\continuous_integration\\appveyor\\run_with_env.cmd"
10+
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\build_tools\\appveyor\\run_with_env.cmd"
1111
WHEELHOUSE_UPLOADER_USERNAME: sklearn-appveyor
1212
WHEELHOUSE_UPLOADER_SECRET:
1313
secure: BQm8KfEj6v2Y+dQxb2syQvTFxDnHXvaNktkLcYSq7jfbTOO6eH9n09tfQzFUVcWZ
@@ -38,7 +38,7 @@ environment:
3838
install:
3939
# Install Python (from the official .msi of http://python.org) and pip when
4040
# not already installed.
41-
- "powershell ./continuous_integration/appveyor/install.ps1"
41+
- "powershell ./build_tools/appveyor/install.ps1"
4242
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
4343
- "python -m pip install -U pip"
4444

@@ -48,7 +48,7 @@ install:
4848
- "pip --version"
4949

5050
# Install the build and runtime dependencies of the project.
51-
- "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com -r continuous_integration/appveyor/requirements.txt"
51+
- "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com -r build_tools/appveyor/requirements.txt"
5252
- "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst -b doc/logos/scikit-learn-logo.bmp"
5353
- ps: "ls dist"
5454

‎continuous_integration/appveyor/install.ps1 renamed to ‎build_tools/appveyor/install.ps1

File renamed without changes.

‎continuous_integration/appveyor/requirements.txt renamed to ‎build_tools/appveyor/requirements.txt

File renamed without changes.

‎continuous_integration/appveyor/run_with_env.cmd renamed to ‎build_tools/appveyor/run_with_env.cmd

File renamed without changes.

‎continuous_integration/circle/build_doc.sh renamed to ‎build_tools/circle/build_doc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
# documentation: a pull request that does not change any file in doc/ or
66
# examples/ folder should be skipped unless the "[doc: build]" is found the
77
# commit message.
8-
BUILD_DOC=`python continuous_integration/circle/check_build_doc.py`
8+
BUILD_DOC=`python build_tools/circle/check_build_doc.py`
99
echo -e $BUILD_DOC
1010
if [[ $BUILD_DOC == "SKIP:"* ]]; then
1111
touch ~/log.txt # the "test" segment needs that file

‎continuous_integration/circle/check_build_doc.py renamed to ‎build_tools/circle/check_build_doc.py

File renamed without changes.

‎continuous_integration/circle/push_doc.sh renamed to ‎build_tools/circle/push_doc.sh

File renamed without changes.

‎sklearn/_build_utils/cythonize.py renamed to ‎build_tools/cythonize.py

File renamed without changes.

‎continuous_integration/after_success.sh renamed to ‎build_tools/travis/after_success.sh

File renamed without changes.

‎continuous_integration/install.sh renamed to ‎build_tools/travis/install.sh

File renamed without changes.

‎continuous_integration/test_script.sh renamed to ‎build_tools/travis/test_script.sh

File renamed without changes.

0 commit comments

Comments
 (0)
0