Skip to content

Commit

Permalink
enh: reorganize build files
Browse files Browse the repository at this point in the history
fix: change path for building doc on circleci

enh: removed useless WindowError and cythonize.dat in _build_utils init
  • Loading branch information
nelson-liu committed Feb 18, 2016
1 parent bf9cd88 commit 4b7a0e0
Show file tree
Hide file tree
Showing 16 changed files with 282 additions and 288 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ matrix:
before_install: sudo apt-get install -yqq libatlas3gf-base libatlas-dev


install: source continuous_integration/install.sh
script: bash continuous_integration/test_script.sh
after_success: source continuous_integration/after_success.sh
install: source build_tools/travis/install.sh
script: bash build_tools/travis/test_script.sh
after_success: source build_tools/travis/after_success.sh
notifications:
webhooks:
urls:
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ environment:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
# /E:ON and /V:ON options are not enabled in the batch script interpreter
# See: http://stackoverflow.com/a/13751649/163740
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\continuous_integration\\appveyor\\run_with_env.cmd"
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\build_tools\\appveyor\\run_with_env.cmd"
WHEELHOUSE_UPLOADER_USERNAME: sklearn-appveyor
WHEELHOUSE_UPLOADER_SECRET:
secure: BQm8KfEj6v2Y+dQxb2syQvTFxDnHXvaNktkLcYSq7jfbTOO6eH9n09tfQzFUVcWZ
Expand Down Expand Up @@ -38,7 +38,7 @@ environment:
install:
# Install Python (from the official .msi of http://python.org) and pip when
# not already installed.
- "powershell ./continuous_integration/appveyor/install.ps1"
- "powershell ./build_tools/appveyor/install.ps1"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- "python -m pip install -U pip"

Expand All @@ -48,7 +48,7 @@ install:
- "pip --version"

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

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
# documentation: a pull request that does not change any file in doc/ or
# examples/ folder should be skipped unless the "[doc: build]" is found the
# commit message.
BUILD_DOC=`python continuous_integration/circle/check_build_doc.py`
BUILD_DOC=`python build_tools/circle/check_build_doc.py`
echo -e $BUILD_DOC
if [[ $BUILD_DOC == "SKIP:"* ]]; then
touch ~/log.txt # the "test" segment needs that file
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 4b7a0e0

Please sign in to comment.