Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Numpy 1.13 for rtd #1957

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions doc/api-hidden.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@
Dataset.std
Dataset.var

Dataset.isnull
Dataset.notnull
Dataset.count
Dataset.dropna
Dataset.fillna
Dataset.where

core.groupby.DatasetGroupBy.assign
core.groupby.DatasetGroupBy.assign_coords
core.groupby.DatasetGroupBy.first
Expand Down Expand Up @@ -68,13 +61,6 @@
DataArray.std
DataArray.var

DataArray.isnull
DataArray.notnull
DataArray.count
DataArray.dropna
DataArray.fillna
DataArray.where

core.groupby.DataArrayGroupBy.assign_coords
core.groupby.DataArrayGroupBy.first
core.groupby.DataArrayGroupBy.last
Expand Down
54 changes: 32 additions & 22 deletions doc/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,22 @@ Indexing
Dataset.reset_index
Dataset.reorder_levels

Missing value handling
----------------------

.. autosummary::
:toctree: generated/

Dataset.isnull
Dataset.notnull
Dataset.count
Dataset.dropna
Dataset.fillna
Dataset.ffill
Dataset.bfill
Dataset.interpolate_na
Dataset.where

Computation
-----------

Expand Down Expand Up @@ -142,17 +158,6 @@ Computation
:py:attr:`~Dataset.std`
:py:attr:`~Dataset.var`

**Missing values**:
:py:attr:`~Dataset.isnull`
:py:attr:`~Dataset.notnull`
:py:attr:`~Dataset.count`
:py:attr:`~Dataset.dropna`
:py:attr:`~Dataset.fillna`
:py:attr:`~Dataset.ffill`
:py:attr:`~Dataset.bfill`
:py:attr:`~Dataset.interpolate_na`
:py:attr:`~Dataset.where`

**ndarray methods**:
:py:attr:`~Dataset.argsort`
:py:attr:`~Dataset.clip`
Expand Down Expand Up @@ -256,6 +261,22 @@ Indexing
DataArray.reset_index
DataArray.reorder_levels

Missing value handling
----------------------

.. autosummary::
:toctree: generated/

DataArray.isnull
DataArray.notnull
DataArray.count
DataArray.dropna
DataArray.fillna
DataArray.ffill
DataArray.bfill
DataArray.interpolate_na
DataArray.where

Comparisons
-----------

Expand Down Expand Up @@ -296,17 +317,6 @@ Computation
:py:attr:`~DataArray.std`
:py:attr:`~DataArray.var`

**Missing values**:
:py:attr:`~DataArray.isnull`
:py:attr:`~DataArray.notnull`
:py:attr:`~DataArray.count`
:py:attr:`~DataArray.dropna`
:py:attr:`~DataArray.fillna`
:py:attr:`~DataArray.ffill`
:py:attr:`~DataArray.bfill`
:py:attr:`~DataArray.interpolate_na`
:py:attr:`~DataArray.where`

**ndarray methods**:
:py:attr:`~DataArray.argsort`
:py:attr:`~DataArray.clip`
Expand Down
4 changes: 2 additions & 2 deletions doc/computation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ methods for working with missing data from pandas:
x.count()
x.dropna(dim='x')
x.fillna(-1)
x.ffill()
x.bfill()
x.ffill('x')
x.bfill('x')

Like pandas, xarray uses the float value ``np.nan`` (not-a-number) to represent
missing values.
Expand Down
2 changes: 1 addition & 1 deletion doc/dask.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ argument to :py:func:`~xarray.open_dataset` or using the
:py:func:`~xarray.open_mfdataset` function.

.. ipython:: python
:suppress:
:suppress:

import numpy as np
import pandas as pd
Expand Down
6 changes: 4 additions & 2 deletions doc/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.5
- numpy=1.11.2
- python=3.6
- numpy=1.13
- pandas=0.21.0
- scipy=1.0
- bottleneck
- numpydoc=0.7.0
- matplotlib=2.0.0
- seaborn=0.8
Expand Down