Unidata · lesserwhirls · Mar 28, 2018 · Mar 27, 2018 · Mar 28, 2018 · Mar 28, 2018
@@ -90,14 +90,14 @@ install:
 
 script:
   - if [[ $TASK == "docs" ]]; then
+      doc8 README.rst docs;
+      export DOC_BUILD_RESULT=$?;
       pushd docs;
       make clean html linkcheck;
-      export DOC_BUILD_RESULT=$?;
-      popd;
-      doc8 README.rst docs;
       if [[ $DOC_BUILD_RESULT -ne 0 || $? -ne 0 ]]; then
         false;
       fi;
+      popd;
     else
       flake8 --version;
       python setup.py test --addopts "-s $TEST_OPTS --no-print-logs";

@@ -1,9 +1,12 @@
+University Corporation for Atmospheric Research/Unidata
+Daniel Watkins
 Derek Groenendyk
 Filipe Fernandes
 Joel Rahman
 John Leeman
 Joshua Clark
 Julien Chastang
+Pete Pokrandt
 Ryan May
 Scott Collis
 Scott Wales

@@ -39,7 +39,7 @@ integrated into contributing to Siphon!
 ## How Can I Talk to You?
 Discussion of Siphon development often happens in the issue tracker and in pull requests.
 In addition, the developers monitor the
-[gitter chat room](https://gitter.im/Unidata/Siphon?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[gitter chat room](https://gitter.im/Unidata/siphon?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 for the project as well.
 
 ## Ground Rules
@@ -62,7 +62,7 @@ of the code you were using, as well as what operating system you are running.
 If possible, include complete, minimal example code that reproduces the problem.
 
 ## Pull Requests
-**Working on your first Pull Request?** You can learn how from this *free* video series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github), Aaron Meurer's [tutorial on the git workflow](http://www.asmeurer.com/git-workflow/), or the guide [“How to Contribute to Open Source"](https://opensource.guide/how-to-contribute/).
+**Working on your first Pull Request?** You can learn how from this *free* video series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github), Aaron Meurer's [tutorial on the git workflow](https://www.asmeurer.com/git-workflow/), or the guide [“How to Contribute to Open Source"](https://opensource.guide/how-to-contribute/).
 We love pull requests from everyone. Fork, then clone the repo:
 
     git clone git@github.com:your-username/siphon.git
@@ -112,7 +112,7 @@ Pull requests will automatically have tests run by Travis. This includes
 running both the unit tests as well as the `flake8` code linter.
 
 [pep8]: http://pep8.org
-[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[commit]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 
 ## Other Channels
 If you're interested in contacting us or being a part of the community in

@@ -1,21 +1,29 @@
-The MIT License (MIT)
+BSD 3-Clause License
 
-Copyright (c) 2013-2016 University Corporation for Atmospheric Research/Unidata.
+Copyright (c) 2013-2018, Siphon Contributors.
+All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -82,7 +82,7 @@
 
 # General information about the project.
 project = 'Siphon'
-copyright = '2015, Unidata'
+copyright = '2018, Siphon Contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -153,6 +153,8 @@ def setup(app):
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {'canonical_url': 'https://unidata.github.io/siphon/latest/'}
+if 'sphinx_rtd_theme' in vars() and sphinx_rtd_theme.__version__ == '0.2.5b1.post1':
+    html_theme_options['versions'] = {'latest': '../latest', 'dev': '../dev'}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []

@@ -67,7 +67,7 @@ Other Resources
 License
 -------
 
-Siphon is available under the terms of the open source `MIT license`__.
+Siphon is available under the terms of the open source `BSD 3-Clause license`__.
 
 __ https://raw.githubusercontent.com/Unidata/siphon/master/LICENSE
 

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 ===============
 THREDDS Catalog

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 =======================
 TDS Radar Query Service

@@ -1,3 +1,6 @@
+# Copyright (c) 2018 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 =============================
 Basic ACIS Web Services Usage

@@ -1,3 +1,6 @@
+# Copyright (c) 2018 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 ===============================
 Multi Station Calls and Mapping

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 ================
 NCSS and CartoPy

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 ==========
 Basic NCSS

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 ================
 NCSS Time Series

@@ -1,6 +1,6 @@
-# Copyright (c) 2018 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2018 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 IGRA2 Upper Air Data Request
 ==============================

@@ -1,6 +1,6 @@
-# Copyright (c) 2017 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2017 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 Wyoming Upper Air Data Request
 ==============================

@@ -2,7 +2,7 @@
 max-line-length = 95
 exclude = siphon/cdmr/ncStream_pb2.py, siphon/cdmr/cdmrfeature_pb2.py, siphon/_version.py
 copyright-check = True
-copyright-author = University Corporation for Atmospheric Research/Unidata
+copyright-author = Siphon Contributors
 application-import-names = siphon
 import-order-style = google
 inline-quotes = single

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Setup script for installing Siphon."""
 
 from __future__ import print_function
@@ -25,7 +25,7 @@
     packages=find_packages(),
     author='Unidata Development Team',
     author_email='support-python@unidata.ucar.edu',
-    license='MIT',
+    license='BSD 3-Clause',
     url='https://github.com/Unidata/siphon',
     description=('A collection of Python utilities for interacting with the '
                  'Unidata technology stack.'),
@@ -40,7 +40,7 @@
                  'Topic :: Scientific/Engineering',
                  'Intended Audience :: Science/Research',
                  'Operating System :: OS Independent',
-                 'License :: OSI Approved :: MIT License'],
+                 'License :: OSI Approved :: BSD License'],
 
     install_requires=dependencies,
     extras_require={

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Tools for accessing atmospheric and oceanic science data on remote servers."""
 
 # Version import needs to come first so everyone else can pull on import

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Tools for data conversion and presentation."""
 
 import numpy as np

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2017 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2017 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """
 Code to support reading and parsing catalog files from a THREDDS Data Server (TDS).
 

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Support for using CDMRemote on a THREDDS Data Server (TDS)."""
 
 from .dataset import Dataset

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Support talking to the CDMRemote endpoint on a THREDDS Data Server (TDS)."""
 
 from io import BytesIO

@@ -1,6 +1,6 @@
-# Copyright (c) 2016 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2016 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Provide access to the CDMRemoteFeature endpoint on TDS."""
 
 from io import BytesIO

@@ -1,6 +1,6 @@
-# Copyright (c) 2016 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2016 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Provide access to a TDS Coverage Dataset."""
 
 from collections import OrderedDict

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2015 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2013-2015 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Provide a netCDF4-like interface on top of CDMRemote and NCStream."""
 
 from __future__ import print_function

@@ -1,6 +1,6 @@
-# Copyright (c) 2014-2016 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2014-2016 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Handle binary stream returns in NCStream format."""
 
 from __future__ import print_function

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2016 University Corporation for Atmospheric Research/Unidata.
+# Copyright (c) 2014-2016 Siphon Contributors.
 # Distributed under the terms of the BSD 3-Clause License.
 # SPDX-License-Identifier: BSD-3-Clause
 """Test the CDM Remote HTTP API."""

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2016 University Corporation for Atmospheric Research/Unidata.
+# Copyright (c) 2014-2016 Siphon Contributors.
 # Distributed under the terms of the BSD 3-Clause License.
 # SPDX-License-Identifier: BSD-3-Clause
 """Test support for CDMRemoteFeature protocol."""

@@ -1,6 +1,6 @@
-# Copyright (c) 2016 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2016 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Test Coverage Dataset."""
 
 import pytest

@@ -1,6 +1,6 @@
-# Copyright (c) 2014-2016 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2014-2016 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Test the operation of the Dataset class from CDMRemote."""
 
 import numpy as np

@@ -1,6 +1,6 @@
-# Copyright (c) 2014-2016 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2014-2016 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Test the low-level ncstream interface."""
 
 from io import BytesIO

@@ -1,6 +1,6 @@
-# Copyright (c) 2014-2016 University Corporation for Atmospheric Research/Unidata.
-# Distributed under the terms of the MIT License.
-# SPDX-License-Identifier: MIT
+# Copyright (c) 2014-2016 Siphon Contributors.
+# Distributed under the terms of the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
 """Test interaction with xarray library."""
 
 from numpy.testing import assert_almost_equal