From aa74704db2b64034f9cff86860607d47d1b9ff43 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Tue, 3 Apr 2018 11:11:36 -0600 Subject: [PATCH 1/3] BUG: Fix Travis not failing on doc errors Accidentally broke exit code handling here. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3503bd510..5ecdbe3d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,13 +91,14 @@ install: script: - if [[ $TASK == "docs" ]]; then doc8 README.rst docs; - export DOC_BUILD_RESULT=$?; + export DOC8_RESULT=$?; pushd docs; make clean html linkcheck; - if [[ $DOC_BUILD_RESULT -ne 0 || $? -ne 0 ]]; then + export DOC_BUILD_RESULT=$?; + popd; + if [[ $DOC_BUILD_RESULT -ne 0 || $DOC8_RESULT -ne 0 ]]; then false; fi; - popd; else flake8 --version; python setup.py test --addopts "-s $TEST_OPTS --no-print-logs"; From db2cf2dbec505149ba6ec562c82330dbe3dfba96 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Tue, 3 Apr 2018 11:26:56 -0600 Subject: [PATCH 2/3] BUG: Fix running sphinx-gallery on windows Windows no likey '/' --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 266e8ed30..dc0eb6cb8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,9 +47,9 @@ 'matplotlib': 'http://matplotlib.org', 'numpy': 'http://docs.scipy.org/doc/numpy/', 'requests': 'http://docs.python-requests.org/en/master/'}, - 'examples_dirs': ['../examples'], + 'examples_dirs': [os.path.join('..', 'examples')], 'gallery_dirs': ['examples'], - 'filename_pattern': '/', + 'filename_pattern': '\.py', 'backreferences_dir': 'api/generated', 'default_thumb_file': os.path.join('_static', 'siphon_150x150_white_bg.png'), 'abort_on_example_error': True From e0218fa7bc74fdda384130ac2baee9061a436749 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Tue, 3 Apr 2018 12:21:20 -0600 Subject: [PATCH 3/3] MNT: Add metpy to dependencies for examples Needed for the unit support. --- environment.yml | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 60ab46ee1..2278a3d5c 100755 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,7 @@ dependencies: - requests - protobuf - netcdf4 + - metpy - jupyter - sphinx - sphinx-gallery diff --git a/setup.py b/setup.py index f318f04fe..058e0660c 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ 'doc': ['sphinx>=1.3,!=1.6.4', 'sphinx-gallery', 'doc8', 'recommonmark'], # SciPy needed for cartopy; we don't use cartopy[plotting] because # that will pull in GDAL. - 'examples': ['matplotlib>=1.3', 'cartopy>=0.13.1', 'scipy'] + 'examples': ['matplotlib>=1.3', 'cartopy>=0.13.1', 'scipy', 'metpy'] }, download_url='https://github.com/Unidata/siphon/archive/v{}.tar.gz'.format(ver),