From aca736062ad07b709570e6b3d848e43c9cca4978 Mon Sep 17 00:00:00 2001 From: Lisandro Dalcin Date: Sat, 11 Jun 2016 01:05:10 +0300 Subject: [PATCH] Reorganize CI scripts and related files --- .binstar.yml | 2 +- .travis.yml | 2 +- MANIFEST.in | 4 ---- README.rst | 2 ++ appveyor.yml | 16 ++++++++-------- conf/{ => ci}/anaconda/mpi4py/meta.yaml | 2 +- conf/{ => ci}/appveyor/download.ps1 | 0 conf/{ => ci}/appveyor/install-anaconda.ps1 | 0 conf/{ => ci}/appveyor/install-msmpi.ps1 | 0 conf/{ => ci}/appveyor/install-python.ps1 | 0 conf/{ => ci}/appveyor/run_with_env.cmd | 0 conf/{jenkins => ci}/fedoracloud.sh | 0 conf/{travis => ci/travis-ci}/install-mpi.sh | 0 13 files changed, 13 insertions(+), 15 deletions(-) rename conf/{ => ci}/anaconda/mpi4py/meta.yaml (97%) rename conf/{ => ci}/appveyor/download.ps1 (100%) rename conf/{ => ci}/appveyor/install-anaconda.ps1 (100%) rename conf/{ => ci}/appveyor/install-msmpi.ps1 (100%) rename conf/{ => ci}/appveyor/install-python.ps1 (100%) rename conf/{ => ci}/appveyor/run_with_env.cmd (100%) rename conf/{jenkins => ci}/fedoracloud.sh (100%) rename conf/{travis => ci/travis-ci}/install-mpi.sh (100%) diff --git a/.binstar.yml b/.binstar.yml index b9faa45b9..00f99a755 100644 --- a/.binstar.yml +++ b/.binstar.yml @@ -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 diff --git a/.travis.yml b/.travis.yml index 022b0d86b..97dbd764a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/MANIFEST.in b/MANIFEST.in index d4547dd4e..2d0e5f28d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -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 diff --git a/README.rst b/README.rst index 67e565dbf..12ef47e3c 100644 --- a/README.rst +++ b/README.rst @@ -43,4 +43,6 @@ The testsuite is run periodically on * `AppVeyor `_ +* `Bitbucket Pipelines `_ + * `Fedora Jenkins `_ diff --git a/appveyor.yml b/appveyor.yml index fd1ccfbdb..fac93499c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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" @@ -61,7 +61,7 @@ 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" @@ -69,7 +69,7 @@ install: - "%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 @@ -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: diff --git a/conf/anaconda/mpi4py/meta.yaml b/conf/ci/anaconda/mpi4py/meta.yaml similarity index 97% rename from conf/anaconda/mpi4py/meta.yaml rename to conf/ci/anaconda/mpi4py/meta.yaml index 45b80c1bd..e4291d640 100644 --- a/conf/anaconda/mpi4py/meta.yaml +++ b/conf/ci/anaconda/mpi4py/meta.yaml @@ -14,7 +14,7 @@ about: source: # git_url: https://bitbucket.org/mpi4py/mpi4py # git_rev: master - path: ../../.. + path: ../../../.. requirements: build: diff --git a/conf/appveyor/download.ps1 b/conf/ci/appveyor/download.ps1 similarity index 100% rename from conf/appveyor/download.ps1 rename to conf/ci/appveyor/download.ps1 diff --git a/conf/appveyor/install-anaconda.ps1 b/conf/ci/appveyor/install-anaconda.ps1 similarity index 100% rename from conf/appveyor/install-anaconda.ps1 rename to conf/ci/appveyor/install-anaconda.ps1 diff --git a/conf/appveyor/install-msmpi.ps1 b/conf/ci/appveyor/install-msmpi.ps1 similarity index 100% rename from conf/appveyor/install-msmpi.ps1 rename to conf/ci/appveyor/install-msmpi.ps1 diff --git a/conf/appveyor/install-python.ps1 b/conf/ci/appveyor/install-python.ps1 similarity index 100% rename from conf/appveyor/install-python.ps1 rename to conf/ci/appveyor/install-python.ps1 diff --git a/conf/appveyor/run_with_env.cmd b/conf/ci/appveyor/run_with_env.cmd similarity index 100% rename from conf/appveyor/run_with_env.cmd rename to conf/ci/appveyor/run_with_env.cmd diff --git a/conf/jenkins/fedoracloud.sh b/conf/ci/fedoracloud.sh similarity index 100% rename from conf/jenkins/fedoracloud.sh rename to conf/ci/fedoracloud.sh diff --git a/conf/travis/install-mpi.sh b/conf/ci/travis-ci/install-mpi.sh similarity index 100% rename from conf/travis/install-mpi.sh rename to conf/ci/travis-ci/install-mpi.sh