diff --git a/.travis.yml b/.travis.yml index 4b502b5..eb2b1a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,17 @@ -language: python - -python: - # We don't actually use the Travis Python, but this keeps it organized. - - "2.7" +language: c +sudo: false install: - - deactivate - # Sets up a MINIConda enviroment in the name of the selected python version - - source devtools/ci/install.sh - # Do not buffer output of python outputs but flush them directly to the terminal - - export PYTHONUNBUFFERED=true + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi + - source devtools/travis-ci/install_miniconda.sh script: - # testing is done by running run_test.sh automatically during build - echo travis_fold:start:conda.build.package - - conda install --yes conda-build - conda build devtools/conda-recipe - echo travis_fold:end:conda.build.package - # Upload new docs - - bash -x devtools/ci/after_sucess.sh - env: - matrix: - - python=2.7 CONDA_PY=27 CONDA_NPY=110 - - python=3.4 CONDA_PY=34 CONDA_NPY=110 - - python=3.5 CONDA_PY=35 CONDA_NPY=110 - - global: - - secure: "NJvoSrLNd2ZR3HluJjEqI36gD5lsucwIvgnYjNmM4cwnnA77aLV9FRYTwlLRZn3XY9FL8KOzL5l0amNzMD7sQrf7bWwWv7iCUBddH549q9RSgiuOugtodYJ6VaXi76hk1rOgcJpDoCj9wTCIlMtWibPUzr1QHmdihfdM2iA2kkE=" - - secure: "l9NJkZDD0ALhkErUvhRrreLsrcWErd+CXpWv8dxHGtkjemNx6CwVtyL+a30jz/QwMANSZbKll/cPK5yJQvuwDaWxja6UPLLKVNGtma+CmwKcIC/wwTwbMoxcS62fyLJ3kS0qR8oCQz2nCPKiYyRGADtPLWVMZckY1SJfNYcKuCM=" - - - secure: kb37xmsSV3pEnESnINzwlW2Cju/UFzA/G+m+NsihAwO8RMPZwKCrZK/rptgkUDACXJxom5M690WEukQkHnOt+OTrWhu7WKZgYeVuWUs2++RohYv/m5npaOHMMn+uYmF328v4PvPmXxbD02zzg5Tgdn82x8oa6J8BKX8ohOQ6Xpg= + - CONDA_PY=2.7 CONDA_NPY=1.7 + - CONDA_PY=2.7 CONDA_NPY=1.11 + - CONDA_PY=3.4 CONDA_NPY=1.10 + - CONDA_PY=3.5 CONDA_NPY=1.11 diff --git a/devtools/ci/after_sucess.sh b/devtools/ci/after_sucess.sh deleted file mode 100755 index c4f142a..0000000 --- a/devtools/ci/after_sucess.sh +++ /dev/null @@ -1,22 +0,0 @@ -echo $TRAVIS_PULL_REQUEST $TRAVIS_BRANCH - -if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then - echo "This is a pull request. No deployment will be done."; exit 0 -fi - -if [[ "$TRAVIS_BRANCH" != "master" ]]; then - echo "No deployment on BRANCH='$TRAVIS_BRANCH'"; exit 0 -fi - -conda install --yes anaconda-client - -echo $python - -if [[ "2.7" =~ "$python" ]]; then - conda convert -p all ~/miniconda2/conda-bld/linux-64/ipynbtest*.tar.bz2 -o ~/miniconda2/conda-bld/ - anaconda -t ${BINSTAR_TOKEN} upload --force --user omnia --package ipynbtest $HOME/miniconda2/conda-bld/*/ipynbtest*.tar.bz2 -fi - -if [[ "$python" != "2.7" ]]; then - echo "No deploy on PYTHON_VERSION=${python}"; exit 0 -fi \ No newline at end of file diff --git a/devtools/ci/requirements-conda.txt b/devtools/ci/requirements-conda.txt deleted file mode 100644 index 0e7da67..0000000 --- a/devtools/ci/requirements-conda.txt +++ /dev/null @@ -1,5 +0,0 @@ -jupyter -ipython -ipython-notebook -pip -nose \ No newline at end of file diff --git a/devtools/ci/requirements.txt b/devtools/ci/requirements.txt deleted file mode 100644 index d27f71e..0000000 --- a/devtools/ci/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -pyflakes -scripttest -nose-exclude -coverage -coveralls \ No newline at end of file diff --git a/devtools/ci/install.sh b/devtools/travis-ci/install_miniconda.sh similarity index 61% rename from devtools/ci/install.sh rename to devtools/travis-ci/install_miniconda.sh index 680130c..496c305 100644 --- a/devtools/ci/install.sh +++ b/devtools/travis-ci/install_miniconda.sh @@ -6,21 +6,22 @@ echo travis_fold:start:install.conda echo Install conda -MINICONDA=Miniconda2-latest-Linux-x86_64.sh +if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then MINICONDA=Miniconda3-latest-MacOSX-x86_64.sh; fi +if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then MINICONDA=Miniconda3-latest-Linux-x86_64.sh; fi + MINICONDA_MD5=$(curl -s https://repo.continuum.io/miniconda/ | grep -A3 $MINICONDA | sed -n '4p' | sed -n 's/ *