Skip to content

Commit

Permalink
Reorganize CI scripts and related files
Browse files Browse the repository at this point in the history
  • Loading branch information
dalcinl committed Jun 10, 2016
1 parent 95949de commit aca7360
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .binstar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ install:
- export CFLAGS=-O0
- conda update --quiet --yes -n root conda-build
- conda config --add channels mpi4py
- conda build --quiet conf/anaconda/mpi4py
- conda build --quiet conf/ci/anaconda/mpi4py

test:
- conda install --quiet --yes numpy nomkl
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install $MPI; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python$PY; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip$PY install numpy; fi
- sh ./conf/travis/install-mpi.sh $MPI
- sh conf/ci/travis-ci/install-mpi.sh $MPI
- pip$PY install Cython
- cython --version
install:
Expand Down
4 changes: 0 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ recursive-include docs/source *
prune misc
prune conf/ci
prune conf/conda-recipes
prune conf/anaconda
prune conf/appveyor
prune conf/jenkins
prune conf/travis
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@ The testsuite is run periodically on

* `AppVeyor <https://ci.appveyor.com/project/mpi4py/mpi4py>`_

* `Bitbucket Pipelines <https://bitbucket.org/mpi4py/mpi4py/addon/pipelines/home>`_

* `Fedora Jenkins <http://jenkins.fedorainfracloud.org/job/mpi4py/>`_
16 changes: 8 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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 intepreter
# See: http://stackoverflow.com/a/13751649/163740
WITH_ENV: "cmd /E:ON /V:ON /C .\\conf\\appveyor\\run_with_env.cmd"
WITH_ENV: "cmd /E:ON /V:ON /C .\\conf\\ci\\appveyor\\run_with_env.cmd"

matrix:
- PYTHON_VERSION: "2.6.6"
Expand Down Expand Up @@ -61,15 +61,15 @@ init:

install:
# Python
- "powershell conf\\appveyor\\install-python.ps1"
- "powershell conf\\ci\\appveyor\\install-python.ps1"
- "%PYTHON%\\python.exe --version"
- "%PYTHON%\\Scripts\\pip.exe --version"
- "%PYTHON%\\Scripts\\wheel.exe version"
# Cython
- "%WITH_ENV% %PYTHON%\\Scripts\\pip.exe install Cython"
- "%PYTHON%\\python.exe -m cython --version"
# Microsoft MPI
- "powershell conf\\appveyor\\install-msmpi.ps1"
- "powershell conf\\ci\\appveyor\\install-msmpi.ps1"
- "SetEnvMPI.cmd"

build: off
Expand All @@ -89,20 +89,20 @@ after_test:
# - "%PYTHON%\\python.exe setup.py --quiet clean --all"
- "set MPI=msmpi"
- "set ANACONDA=C:\\Anaconda"
- "powershell conf\\appveyor\\install-anaconda.ps1"
- "powershell conf\\ci\\appveyor\\install-anaconda.ps1"
- "set PATH=%ANACONDA%;%ANACONDA%\\Scripts\\;%PATH%"
- "conda info --all"
- "conda list"
- "%WITH_ENV% conda build --quiet --python %PYTHON_VERSION:~0,3% conf\\anaconda\\mpi4py"
- "%WITH_ENV% conda build --quiet --python %PYTHON_VERSION:~0,3% conf\\ci\\anaconda\\mpi4py"
- ps: "Move-Item $env:ANACONDA\\conda-bld\\win-*\\mpi4py-*.tar.bz2 dist\\ -Force"

artifacts:
- path: dist\*

cache:
- C:\Downloads\Python -> conf\appveyor\install-python.ps1
- C:\Downloads\MSMPI -> conf\appveyor\install-msmpi.ps1
- C:\Downloads\Anaconda -> conf\appveyor\install-anaconda.ps1
- C:\Downloads\Python -> conf\ci\appveyor\install-python.ps1
- C:\Downloads\MSMPI -> conf\ci\appveyor\install-msmpi.ps1
- C:\Downloads\Anaconda -> conf\ci\appveyor\install-anaconda.ps1
- '%LOCALAPPDATA%\pip\Cache'

#on_success:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ about:
source:
# git_url: https://bitbucket.org/mpi4py/mpi4py
# git_rev: master
path: ../../..
path: ../../../..

requirements:
build:
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.
File renamed without changes.

0 comments on commit aca7360

Please sign in to comment.