Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
dopplershift committed Sep 27, 2019
2 parents 4060374 + f6dfe81 commit 6116cec
Show file tree
Hide file tree
Showing 24 changed files with 927 additions and 74 deletions.
28 changes: 10 additions & 18 deletions .travis.yml
Expand Up @@ -61,25 +61,17 @@ matrix:
env: TASK="docs" PRE="--pre"
- python: nightly
env: PRE="--pre"
- python: 3.7
- python: "3.7-dev"
env:
- TASK="coverage"
- VERSIONS="git+git://github.com/hgrecco/pint@master#egg=pint git+git://github.com/pydata/xarray@master#egg=xarray"
- python: 3.7
- python: "3.7-dev"
env:
- TASK="docs"
- VERSIONS="git+git://github.com/hgrecco/pint@master#egg=pint git+git://github.com/pydata/xarray@master#egg=xarray"
allow_failures:
- python: "3.7-dev"
- python: nightly
- python: 3.7
env:
- TASK="coverage"
- VERSIONS="git+git://github.com/hgrecco/pint@master#egg=pint git+git://github.com/pydata/xarray@master#egg=xarray"
- python: 3.7
env:
- TASK="docs"
- VERSIONS="git+git://github.com/hgrecco/pint@master#egg=pint git+git://github.com/pydata/xarray@master#egg=xarray"

before_install:
# We hard-code the sphinx_rtd_theme to lock in our build with patch for
Expand Down Expand Up @@ -117,11 +109,12 @@ before_install:
# Cython needs to be installed before even downloading CartoPy
- python -m pip install Cython;
- python -m pip download -d $WHEELDIR ".[$EXTRA_INSTALLS]" $EXTRA_PACKAGES -f $WHEELHOUSE $PRE $VERSIONS;
- touch $WHEELDIR/download_marker && ls -lrt $WHEELDIR;
- touch $WHEELDIR/download_marker;
- travis_wait python -m pip wheel -w $WHEELDIR $EXTRA_PACKAGES -f $WHEELHOUSE $PRE $VERSIONS;
- python -m pip install $EXTRA_PACKAGES --upgrade --upgrade-strategy=eager --no-index -f file://$PWD/$WHEELDIR $VERSIONS;
- travis_wait 30 python -m pip wheel -w $WHEELDIR ".[$EXTRA_INSTALLS]" $EXTRA_PACKAGES -f $WHEELHOUSE $PRE $VERSIONS;
- rm -f $WHEELDIR/MetPy*.whl;
# Make sure we don't upload MetPy or other development build wheels
- rm -f $WHEELDIR/MetPy*.whl $WHEELDIR/xarray-*+*.whl $WHEELDIR/Pint-*dev*.whl;

install:
- python -m pip install ".[$EXTRA_INSTALLS]" --upgrade --upgrade-strategy=eager --no-index $PRE -f file://$PWD/$WHEELDIR $VERSIONS;
Expand Down Expand Up @@ -156,6 +149,8 @@ after_script:
python-codacy-coverage -r coverage.xml;
codeclimate-test-reporter;
fi
- ls -lr --full-time $WHEELDIR;
- echo $(find $WHEELDIR -newer $WHEELDIR/download_marker -name *.whl | tr [:space:] :)

before_deploy:
# Remove unused, unminified javascript from sphinx
Expand All @@ -167,22 +162,19 @@ before_deploy:

deploy:
- provider: pypi
user: dopplershift
password:
secure: VYbxLZZnQ1hR2WZwe6+NXLNVbxceDQzlaVM/G3PW8mYlnyWgIVJBgCcgpH22wT4IsNQqo1r9ow9HiybzwcU1VTZ9KXjYsjre/kCZob0jmuPKlDtujOLaMJFf0XzOw7Y/AFXaMakFA8ZOYJLaMXc0WMLwGT7Hw/oP/e2ztpVLxRA=
username: __token__
distributions: sdist bdist_wheel
upload_docs: no
on:
repo: Unidata/MetPy
python: 3.6
python: 3.7
condition: '$TASK != "docs"'
tags: true
- provider: script
script: ci/deploy_docs.sh
skip_cleanup: true
on:
all_branches: true
python: 3.6
python: 3.7
condition: '$TASK == "docs"'

notifications:
Expand Down
1 change: 1 addition & 0 deletions docs/SUPPORT.md
2 changes: 1 addition & 1 deletion docs/_templates/autosummary/module.rst
@@ -1,4 +1,4 @@
{% if fullname in ['metpy.calc'] %}
{% if fullname in ['metpy.calc', 'metpy.plots.ctables', 'metpy.xarray'] %}

{% include 'overrides/' ~ fullname ~ '.rst' with context %}

Expand Down
26 changes: 26 additions & 0 deletions docs/_templates/overrides/metpy.plots.ctables.rst
@@ -0,0 +1,26 @@


ctables
===================

.. automodule:: metpy.plots.ctables



.. rubric:: Functions

.. autosummary::
:toctree: ./

convert_gempak_table
read_colortable
resource_listdir
resource_stream

.. rubric:: Classes

.. autosummary::
:toctree: ./

ColortableRegistry
colortables
13 changes: 13 additions & 0 deletions docs/_templates/overrides/metpy.xarray.rst
@@ -0,0 +1,13 @@
xarray
==========

.. automodule:: metpy.xarray

Accessors
---------

.. autoclass:: MetPyDataArrayAccessor()
:members:

.. autoclass:: MetPyDatasetAccessor()
:members:
1 change: 1 addition & 0 deletions docs/api/index.rst
Expand Up @@ -17,6 +17,7 @@ Reference Guide
metpy.plots.ctables
metpy.interpolate
metpy.gridding
metpy.xarray

* :ref:`modindex`
* :ref:`genindex`
11 changes: 7 additions & 4 deletions docs/index.rst
Expand Up @@ -11,12 +11,14 @@
:hidden:

installguide
startingguide
units
examples/index
tutorials/index
api/index
roadmap
gempak
SUPPORT
CONTRIBUTING
infrastructureguide
citing
Expand All @@ -27,7 +29,8 @@ MetPy
=====

MetPy is a collection of tools in Python for reading, visualizing, and
performing calculations with weather data.
performing calculations with weather data. If you're new to MetPy, check
out our :doc:`Getting Started <startingguide>` guide.

MetPy follows `semantic versioning <https://semver.org>`_ in its version number. With our
current 0.x version, that implies that MetPy's APIs (application programming interfaces) are
Expand Down Expand Up @@ -122,11 +125,11 @@ Related Projects
----------------

* netCDF4-python_ is the officially blessed Python API for netCDF_
* siphon_ is an API for accessing remote data on `THREDDS Data Server`__
* unidata_python_gallery_ is a collection of meteorological Python scripts
* siphon_ is a Python API for accessing remote data on `THREDDS Data Servers`__
* The `Unidata Python Gallery`_ is a collection of meteorological Python scripts

.. _netCDF4-python: https://unidata.github.io/netcdf4-python/
.. _netCDF: https://www.unidata.ucar.edu/software/netcdf/
.. _siphon: https://unidata.github.io/siphon/
.. _unidata_python_gallery: https://unidata.github.io/python-gallery/
.. _Unidata Python Gallery: https://unidata.github.io/python-gallery/
__ https://www.unidata.ucar.edu/software/thredds/current/tds/
6 changes: 6 additions & 0 deletions docs/override_check.py
Expand Up @@ -13,12 +13,18 @@
import sys


modules_to_skip = ['metpy.xarray']


failed = False
for full_path in glob.glob('_templates/overrides/metpy.*.rst'):

filename = os.path.basename(full_path)
module = filename.split('.rst')[0]

if module in modules_to_skip:
continue

# Get all functions in the module
i = importlib.import_module(module)
functions = set(i.__all__)
Expand Down

0 comments on commit 6116cec

Please sign in to comment.