Skip to content

Commit 6a6ba1b

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix/allow_lazy
* upstream/master: (27 commits) drop_vars; deprecate drop for variables (pydata#3475) uamiv test using only raw uamiv variables (pydata#3485) Optimize dask array equality checks. (pydata#3453) Propagate indexes in DataArray binary operations. (pydata#3481) python 3.8 tests (pydata#3477) __dask_tokenize__ (pydata#3446) Type check sentinel values (pydata#3472) Fix typo in docstring (pydata#3474) fix test suite warnings re `drop` (pydata#3460) Fix integrate docs (pydata#3469) Fix leap year condition in monthly means example (pydata#3464) Hypothesis tests for roundtrip to & from pandas (pydata#3285) unpin cftime (pydata#3463) Cleanup whatsnew (pydata#3462) enable xr.ALL_DIMS in xr.dot (pydata#3424) Merge stable into master (pydata#3457) upgrade black verison to 19.10b0 (pydata#3456) Remove outdated code related to compatibility with netcdftime (pydata#3450) Remove deprecated behavior from dataset.drop docstring (pydata#3451) jupyterlab dark theme (pydata#3443) ...
2 parents aadd922 + 0e8debf commit 6a6ba1b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2608
-674
lines changed

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ prune doc/generated
66
global-exclude .DS_Store
77
include versioneer.py
88
include xarray/_version.py
9+
recursive-include xarray/static *

README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,7 @@ under a "3-clause BSD" license:
138138
xarray also bundles portions of CPython, which is available under the "Python
139139
Software Foundation License" in xarray/core/pycompat.py.
140140

141+
xarray uses icons from the icomoon package (free version), which is
142+
available under the "CC BY 4.0" license.
143+
141144
The full text of these licenses are included in the licenses directory.

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
conda_env: py36
1919
py37:
2020
conda_env: py37
21+
py38:
22+
conda_env: py38
2123
py37-upstream-dev:
2224
conda_env: py37
2325
upstream_dev: true

ci/requirements/py36-min-all-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- cartopy=0.17
1414
- cdms2=3.1
1515
- cfgrib=0.9
16-
- cftime=1.0.3 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken
16+
- cftime=1.0
1717
- coveralls
1818
- dask=1.2
1919
- distributed=1.27

ci/requirements/py36.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cartopy
1010
- cdms2
1111
- cfgrib
12-
- cftime<1.0.4 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken
12+
- cftime
1313
- coveralls
1414
- dask
1515
- distributed

ci/requirements/py37-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cartopy
1010
# - cdms2 # Not available on Windows
1111
# - cfgrib # Causes Python interpreter crash on Windows
12-
- cftime<1.0.4 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken
12+
- cftime
1313
- coveralls
1414
- dask
1515
- distributed

ci/requirements/py37.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cartopy
1010
- cdms2
1111
- cfgrib
12-
- cftime<1.0.4 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken
12+
- cftime
1313
- coveralls
1414
- dask
1515
- distributed

ci/requirements/py38.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: xarray-tests
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.8
6+
- pip
7+
- pip:
8+
- coveralls
9+
- dask
10+
- distributed
11+
- numpy
12+
- pandas
13+
- pytest
14+
- pytest-cov
15+
- pytest-env

doc/data-structures.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,14 @@ methods (like pandas) for transforming datasets into new objects.
393393

394394
For removing variables, you can select and drop an explicit list of
395395
variables by indexing with a list of names or using the
396-
:py:meth:`~xarray.Dataset.drop` methods to return a new ``Dataset``. These
396+
:py:meth:`~xarray.Dataset.drop_vars` methods to return a new ``Dataset``. These
397397
operations keep around coordinates:
398398

399399
.. ipython:: python
400400
401401
ds[['temperature']]
402402
ds[['temperature', 'temperature_double']]
403-
ds.drop('temperature')
403+
ds.drop_vars('temperature')
404404
405405
To remove a dimension, you can use :py:meth:`~xarray.Dataset.drop_dims` method.
406406
Any variables using that dimension are dropped:
@@ -411,7 +411,7 @@ Any variables using that dimension are dropped:
411411
412412
As an alternate to dictionary-like modifications, you can use
413413
:py:meth:`~xarray.Dataset.assign` and :py:meth:`~xarray.Dataset.assign_coords`.
414-
These methods return a new dataset with additional (or replaced) or values:
414+
These methods return a new dataset with additional (or replaced) values:
415415

416416
.. ipython:: python
417417
@@ -420,7 +420,7 @@ These methods return a new dataset with additional (or replaced) or values:
420420
There is also the :py:meth:`~xarray.Dataset.pipe` method that allows you to use
421421
a method call with an external function (e.g., ``ds.pipe(func)``) instead of
422422
simply calling it (e.g., ``func(ds)``). This allows you to write pipelines for
423-
transforming you data (using "method chaining") instead of writing hard to
423+
transforming your data (using "method chaining") instead of writing hard to
424424
follow nested function calls:
425425

426426
.. ipython:: python

doc/examples/monthly-means.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ the ``calendar.month_range`` function.
8383
8484
for i, (month, year) in enumerate(zip(time.month, time.year)):
8585
month_length[i] = cal_days[month]
86-
if leap_year(year, calendar=calendar):
86+
if leap_year(year, calendar=calendar) and month == 2:
8787
month_length[i] += 1
8888
return month_length
8989

0 commit comments

Comments
 (0)