-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #714 from MPAS-Dev/develop
Merge develop to master for 1.2.7 release
- Loading branch information
Showing
246 changed files
with
11,022 additions
and
6,432 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,48 @@ | ||
| # Based on http://conda.pydata.org/docs/travis.html | ||
| language: python | ||
| sudo: false # use container based build | ||
| # Based on https://github.com/NOAA-ORR-ERD/gridded/blob/master/.travis.yml | ||
| language: minimal | ||
|
|
||
| sudo: false | ||
|
|
||
| notifications: | ||
| email: false | ||
|
|
||
| matrix: | ||
| fast_finish: true | ||
| include: | ||
| - python: 3.6 | ||
| - python: 3.7 | ||
| dist: xenial | ||
| sudo: true | ||
| - name: "python-3.6" | ||
| python: 3.6 | ||
| env: CONDA_ENV=py36 | ||
| - name: "python-3.7" | ||
| python: 3.7 | ||
| env: CONDA_ENV=py37 | ||
| - name: "python-3.8" | ||
| python: 3.8 | ||
| env: CONDA_ENV=py38 | ||
| - name: "python-3.7-xarray-master" | ||
| python: 3.7 | ||
| env: CONDA_ENV=py37-xarray-master | ||
|
|
||
| env: | ||
| global: | ||
| secure: "RcARu+7YXJCWMDkwaP151JUuJW0aei0DG8ES6xwjlPjCy0wht1aDyZlcS4aE+hoQOZL/dGM4ppKLoxy7PlTMg3bocn4782VbnGT1p94FieuNVj+irs54UrTBouKbDmJQtgGPNV8WnXt3suKlcb62304eJs5Ryfl2ZOIpS+yBFcfUgTFn3wBGba4WO+wzx2mG+e5E6CIOLkoFlLYaJJ+2vShXHaCNYIgq4DrLYR1U/Jq6HAli6x3iETPqL0ZPdLAtB96lYYssV+4VZjyMzAkxNjj3RhRAIFH8K/Fe9VWke1MZqwnz0Bu2Z8GyhwFkdc8u+epUDCUIgGxGps57RgiBi2dmLW0RyNdQ2pG5WgT7M5/dkx4STq2ofv/YAKniG7LyM30X/H7G9/RlyIQ354P54265zdul1sasREeHKhNe82QsX2tos/jo7/E2f0uYtrQ1btSo1jItyTukOHER11W6yqYTSc4yqFJLCXxWFbEuzSyaIfVp7AJFHGjYU3A/ZdMG6Y+cs9Q/xapwx2Zoon67GGDJ7OItQeScKcF7pIYbo1uWWYHdQ9GBedyqWgqz75H6wCXbxo2jGUze/pP5I/2plBMeDiY4eSBulbbpupRXpj1uNOAZv+PiP1UDjwMQCzz/NwBLCcG+jxEDwOHnzoPwPnZeOBNPHXkEAZxeW9z9TjA=" | ||
|
|
||
| before_install: | ||
| - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; | ||
| - bash miniconda.sh -b -p $HOME/miniconda | ||
| - export PATH="$HOME/miniconda/bin:$PATH" | ||
| - hash -r | ||
| - conda config --set always_yes yes --set changeps1 no --set show_channel_urls true | ||
| - conda update -q conda | ||
| - conda info -a | ||
| - | | ||
| wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh | ||
| bash miniconda.sh -b -p $HOME/miniconda | ||
| source $HOME/miniconda/etc/profile.d/conda.sh | ||
| conda activate base | ||
| conda config --set always_yes yes --set changeps1 no --set show_channel_urls true | ||
| conda update conda | ||
| conda config --add channels conda-forge --force | ||
| conda config --set channel_priority strict | ||
| conda env create --file ci/environment-$CONDA_ENV.yml | ||
| source activate TEST | ||
| # conda info --all | ||
| # conda list | ||
| install: | ||
| - conda create -n test_env -c conda-forge python=$TRAVIS_PYTHON_VERSION | ||
| - conda env update -n test_env -f ci/requirements.yml | ||
| - source activate test_env | ||
| - conda list | ||
| - ./ci/install.bash | ||
|
|
||
| script: | ||
| - pytest | ||
| - ./ci/test_and_publish_docs.bash |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: TEST | ||
| dependencies: | ||
| - python=3.6 | ||
| - pytest | ||
| - six | ||
| - numpy | ||
| - scipy | ||
| - lxml | ||
| - xarray >=0.14.1 | ||
| - matplotlib-base >=3.0.2 | ||
| - dask | ||
| - netcdf4 | ||
| - hdf5 | ||
| - hdf4 | ||
| - nco >=4.8.1 | ||
| - pyproj | ||
| - pillow | ||
| - cmocean | ||
| - progressbar2 | ||
| - requests | ||
| - shapely | ||
| - cartopy >=0.18.0 | ||
| - geometric_features | ||
| - gsw | ||
| - pyremap | ||
| - mpas_tools | ||
| - sphinx | ||
| - mock | ||
| - sphinx_rtd_theme | ||
| - numpydoc | ||
| - tabulate >=0.8.2 | ||
| - m2r |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| name: TEST | ||
| dependencies: | ||
| - python=3.7 | ||
| - pytest | ||
| - six | ||
| - numpy | ||
| - scipy | ||
| - lxml | ||
| - matplotlib-base >=3.0.2 | ||
| - dask | ||
| - netcdf4 | ||
| - hdf5 | ||
| - hdf4 | ||
| - nco >=4.8.1 | ||
| - pyproj | ||
| - pillow | ||
| - cmocean | ||
| - progressbar2 | ||
| - requests | ||
| - shapely | ||
| - cartopy >=0.18.0 | ||
| - geometric_features | ||
| - gsw | ||
| - pyremap | ||
| - mpas_tools | ||
| - sphinx | ||
| - mock | ||
| - sphinx_rtd_theme | ||
| - numpydoc | ||
| - tabulate >=0.8.2 | ||
| - m2r | ||
| - pip: | ||
| # following https://github.com/xgcm/xgcm/blob/master/ci/environment-py37-upstream-master.yml | ||
| - git+https://github.com/pydata/xarray.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: TEST | ||
| dependencies: | ||
| - python=3.7 | ||
| - pytest | ||
| - six | ||
| - numpy | ||
| - scipy | ||
| - lxml | ||
| - xarray >=0.14.1 | ||
| - matplotlib-base >=3.0.2 | ||
| - dask | ||
| - netcdf4 | ||
| - hdf5 | ||
| - hdf4 | ||
| - nco >=4.8.1 | ||
| - pyproj | ||
| - pillow | ||
| - cmocean | ||
| - progressbar2 | ||
| - requests | ||
| - shapely | ||
| - cartopy >=0.18.0 | ||
| - geometric_features | ||
| - gsw | ||
| - pyremap | ||
| - mpas_tools | ||
| - sphinx | ||
| - mock | ||
| - sphinx_rtd_theme | ||
| - numpydoc | ||
| - tabulate >=0.8.2 | ||
| - m2r |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: TEST | ||
| dependencies: | ||
| - python=3.8 | ||
| - pytest | ||
| - six | ||
| - numpy | ||
| - scipy | ||
| - lxml | ||
| - xarray >=0.14.1 | ||
| - matplotlib-base >=3.0.2 | ||
| - dask | ||
| - netcdf4 | ||
| - hdf5 | ||
| - hdf4 | ||
| - nco >=4.8.1 | ||
| - pyproj | ||
| - pillow | ||
| - cmocean | ||
| - progressbar2 | ||
| - requests | ||
| - shapely | ||
| - cartopy >=0.18.0 | ||
| - geometric_features | ||
| - gsw | ||
| - pyremap | ||
| - mpas_tools | ||
| - sphinx | ||
| - mock | ||
| - sphinx_rtd_theme | ||
| - numpydoc | ||
| - tabulate >=0.8.2 | ||
| - m2r |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| pip install -e . --no-deps | ||
|
|
||
| if [[ "$TRAVIS_BRANCH" == "develop" ]]; then | ||
| export DOCS_VERSION="latest" | ||
| elif [[ "$TRAVIS_BRANCH" == "master" ]]; then | ||
| export DOCS_VERSION="stable" | ||
| elif [ -n "$TRAVIS_TAG" ]; then | ||
| # this is a tag build | ||
| export DOCS_VERSION="$TRAVIS_TAG" | ||
| else | ||
| DOCS_VERSION=`python -c "import mpas_analysis; print(mpas_analysis.__version__)"` | ||
| export DOCS_VERSION | ||
| fi | ||
| cd docs || exit 1 | ||
| make clean | ||
| make html | ||
| cd .. |
Oops, something went wrong.