Merge pull request #2 from pydata/master

Sync with upstream master

Author: pletchm

.gitignore

@@ -35,6 +35,7 @@ pip-log.txt
 .tox
 nosetests.xml
 .cache
+.mypy_cache
 .ropeproject/
 .tags*
 .testmon*

.travis.yml

@@ -19,7 +19,6 @@ matrix:
     - EXTRA_FLAGS="--run-flaky --run-network-tests"
   - env: CONDA_ENV=py36-dask-dev
   - env: CONDA_ENV=py36-pandas-dev
-  - env: CONDA_ENV=py36-bottleneck-dev
   - env: CONDA_ENV=py36-rasterio
   - env: CONDA_ENV=py36-zarr-dev
   - env: CONDA_ENV=docs
@@ -31,7 +30,6 @@ matrix:
     - CONDA_ENV=py36
     - EXTRA_FLAGS="--run-flaky --run-network-tests"
   - env: CONDA_ENV=py36-pandas-dev
-  - env: CONDA_ENV=py36-bottleneck-dev
   - env: CONDA_ENV=py36-zarr-dev
 
 before_install:
@@ -67,7 +65,7 @@ script:
     elif [[ "$CONDA_ENV" == "py36-hypothesis" ]]; then
       pytest properties ;
     else
-      py.test xarray --cov=xarray --cov-config ci/.coveragerc --cov-report term-missing --verbose $EXTRA_FLAGS;
+      py.test xarray --cov=xarray --cov-config ci/.coveragerc --cov-report term-missing $EXTRA_FLAGS;
     fi
 
 after_success:

README.rst

@@ -8,9 +8,9 @@ xarray: N-D labeled arrays and datasets
 .. image:: https://coveralls.io/repos/pydata/xarray/badge.svg
    :target: https://coveralls.io/r/pydata/xarray
 .. image:: https://readthedocs.org/projects/xray/badge/?version=latest
-   :target: http://xarray.pydata.org/
-.. image:: http://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat
-  :target: http://pandas.pydata.org/speed/xarray/
+   :target: https://xarray.pydata.org/
+.. image:: https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat
+  :target: https://pandas.pydata.org/speed/xarray/
 .. image:: https://img.shields.io/pypi/v/xarray.svg
    :target: https://pypi.python.org/pypi/xarray/
 
@@ -30,10 +30,10 @@ It is particularly tailored to working with netCDF_ files, which were the
 source of xarray's data model, and integrates tightly with dask_ for parallel
 computing.
 
-.. _NumPy: http://www.numpy.org
-.. _pandas: http://pandas.pydata.org
-.. _dask: http://dask.org
-.. _netCDF: http://www.unidata.ucar.edu/software/netcdf
+.. _NumPy: https://www.numpy.org
+.. _pandas: https://pandas.pydata.org
+.. _dask: https://dask.org
+.. _netCDF: https://www.unidata.ucar.edu/software/netcdf
 
 Why xarray?
 -----------
@@ -66,12 +66,12 @@ powerful and concise interface. For example:
 Documentation
 -------------
 
-Learn more about xarray in its official documentation at http://xarray.pydata.org/
+Learn more about xarray in its official documentation at https://xarray.pydata.org/
 
 Contributing
 ------------
 
-You can find information about contributing to xarray at our `Contributing page <http://xarray.pydata.org/en/latest/contributing.html#>`_.
+You can find information about contributing to xarray at our `Contributing page <https://xarray.pydata.org/en/latest/contributing.html#>`_.
 
 Get in touch
 ------------
@@ -81,9 +81,9 @@ Get in touch
 - For less well defined questions or ideas, or to announce other projects of
   interest to xarray users, use the `mailing list`_.
 
-.. _StackOverFlow: http://stackoverflow.com/questions/tagged/python-xarray
+.. _StackOverFlow: https://stackoverflow.com/questions/tagged/python-xarray
 .. _mailing list: https://groups.google.com/forum/#!forum/xarray
-.. _on GitHub: http://github.com/pydata/xarray
+.. _on GitHub: https://github.com/pydata/xarray
 
 NumFOCUS
 --------
@@ -97,7 +97,7 @@ to supporting the open source scientific computing community. If you like
 Xarray and want to support our mission, please consider making a donation_
 to support our efforts.
 
-.. _donation: https://www.flipcause.com/secure/cause_pdetails/NDE2NTU=
+.. _donation: https://numfocus.salsalabs.org/donate-to-xarray/
 
 History
 -------
@@ -120,7 +120,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

ci/requirements-py35-min.yml

@@ -1,6 +1,6 @@
 name: test_env
 dependencies:
-  - python=3.5
+  - python=3.5.0
   - pytest
   - flake8
   - mock

ci/requirements-py36-bottleneck-dev.yml

@@ -20,16 +20,16 @@ dependencies:
   - scipy
   - seaborn
   - toolz
-  # - rasterio  # xref #2683
+  - rasterio
   - bottleneck
   - zarr
   - pseudonetcdf>=3.0.1
   - eccodes
   - cdms2
-# - pynio  # xref #2683
-# - iris>=1.10  # xref #2683
+  - pynio
+  - iris>=1.10
   - pydap
   - lxml
   - pip:
     - cfgrib>=0.9.2
-    - mypy==0.650
+    - mypy==0.660

ci/requirements-py36.yml

@@ -4,6 +4,7 @@ channels:
 dependencies:
   - python=3.7
   - cftime
+  - nc-time-axis
   - dask
   - distributed
   - h5py

ci/requirements-py37-windows.yml

@@ -4,6 +4,7 @@ channels:
 dependencies:
   - python=3.7
   - cftime
+  - nc-time-axis
   - dask
   - distributed
   - h5py

ci/requirements-py37.yml

@@ -87,6 +87,7 @@ Dataset contents
    Dataset.swap_dims
    Dataset.expand_dims
    Dataset.drop
+   Dataset.drop_dims
    Dataset.set_coords
    Dataset.reset_coords
 

doc/api.rst

@@ -285,17 +285,23 @@ How to build the *xarray* documentation
 
 Requirements
 ~~~~~~~~~~~~
+Make sure to follow the instructions on :ref:`creating a development environment above <contributing.dev_env>`, but
+to build the docs you need to use the environment file ``doc/environment.yml``.
 
-First, you need to have a development environment to be able to build xarray
-(see the docs on :ref:`creating a development environment above <contributing.dev_env>`).
+.. code-block:: none
 
-Building the documentation
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # Create and activate the docs environment
+    conda env create -f doc/environment.yml
+    conda activate xarray-docs
 
-In your development environment, install ``sphinx``, ``sphinx_rtd_theme``,
-``sphinx-gallery`` and ``numpydoc``::
+    # or with older versions of Anaconda:
+    source activate xarray-docs
 
-    conda install -c conda-forge sphinx sphinx_rtd_theme sphinx-gallery numpydoc
+    # Build and install xarray
+    pip install -e .
+
+Building the documentation
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Navigate to your local ``xarray/doc/`` directory in the console and run::
 

doc/contributing.rst

@@ -353,13 +353,6 @@ setting) variables and attributes:
 This is particularly useful in an exploratory context, because you can
 tab-complete these variable names with tools like IPython.
 
-.. warning::
-
-  We are changing the behavior of iterating over a Dataset the next major
-  release of xarray, to only include data variables instead of both data
-  variables and coordinates. In the meantime, prefer iterating over
-  ``ds.data_vars`` or ``ds.coords``.
-
 Dictionary like methods
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -370,6 +363,7 @@ example, to create this example dataset from scratch, we could have written:
 
     ds = xr.Dataset()
     ds['temperature'] = (('x', 'y', 'time'), temp)
+    ds['temperature_double'] = (('x', 'y', 'time'), temp * 2 )
     ds['precipitation'] = (('x', 'y', 'time'), precip)
     ds.coords['lat'] = (('x', 'y'), lat)
     ds.coords['lon'] = (('x', 'y'), lon)
@@ -404,9 +398,16 @@ operations keep around coordinates:
 
 .. ipython:: python
 
-    list(ds[['temperature']])
-    list(ds[['x']])
-    list(ds.drop('temperature'))
+    ds[['temperature']]
+    ds[['temperature', 'temperature_double']]
+    ds.drop('temperature')
+
+To remove a dimension, you can use :py:meth:`~xarray.Dataset.drop_dims` method.
+Any variables using that dimension are dropped:
+
+.. ipython:: python
+
+    ds.drop_dims('time')
 
 As an alternate to dictionary-like modifications, you can use
 :py:meth:`~xarray.Dataset.assign` and :py:meth:`~xarray.Dataset.assign_coords`.

doc/data-structures.rst

@@ -4,7 +4,6 @@ Examples
 .. toctree::
     :maxdepth: 2
 
-    examples/quick-overview
     examples/weather-data
     examples/monthly-means
     examples/multidimensional-coords