Merge pull request #211 from dopplershift/doc-errors

Fix documentation build
Unidata · Apr 3, 2018 · 9f7bf0f · 9f7bf0f
2 parents 3ad9a46 + e0218fa
commit 9f7bf0f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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";

diff --git 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

diff --git 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
@@ -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),