Skip to content

Commit 39983a5

Browse files
author
dcherian
committed
Fix lists.
1 parent 22d5f9e commit 39983a5

File tree

4 files changed

+28
-25
lines changed

4 files changed

+28
-25
lines changed

xarray/backends/api.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -516,12 +516,12 @@ def open_mfdataset(paths, chunks=None, concat_dim=_CONCAT_DIM_DEFAULT,
516516
compat : {'identical', 'equals', 'broadcast_equals', 'no_conflicts'}, optional
517517
String indicating how to compare variables of the same name for
518518
potential conflicts when merging:
519-
* 'broadcast_equals': all values must be equal when variables are
519+
- 'broadcast_equals': all values must be equal when variables are
520520
broadcast against each other to ensure common dimensions.
521-
* 'equals': all values and dimensions must be the same.
522-
* 'identical': all values, dimensions and attributes must be the
521+
- 'equals': all values and dimensions must be the same.
522+
- 'identical': all values, dimensions and attributes must be the
523523
same.
524-
* 'no_conflicts': only values which are not null in both datasets
524+
- 'no_conflicts': only values which are not null in both datasets
525525
must be equal. The returned dataset then contains the combination
526526
of all non-null values.
527527
preprocess : callable, optional
@@ -541,34 +541,34 @@ def open_mfdataset(paths, chunks=None, concat_dim=_CONCAT_DIM_DEFAULT,
541541
data_vars : {'minimal', 'different', 'all' or list of str}, optional
542542
These data variables will be concatenated together:
543543
544-
* 'minimal': Only data variables in which the dimension already
544+
- 'minimal': Only data variables in which the dimension already
545545
appears are included.
546-
* 'different': Data variables which are not equal (ignoring
546+
- 'different': Data variables which are not equal (ignoring
547547
attributes) across all datasets are also concatenated (as well as
548548
all for which dimension already appears). Beware: this option may
549549
load the data payload of data variables into memory if they are not
550550
already loaded.
551-
* 'all': All data variables will be concatenated.
552-
* list of str: The listed data variables will be concatenated, in
551+
- 'all': All data variables will be concatenated.
552+
- list of str: The listed data variables will be concatenated, in
553553
addition to the 'minimal' data variables.
554554
coords : {'minimal', 'different', 'all' o list of str}, optional
555555
These coordinate variables will be concatenated together:
556556
557-
* 'minimal': Only coordinates in which the dimension already appears
557+
- 'minimal': Only coordinates in which the dimension already appears
558558
are included.
559-
* 'different': Coordinates which are not equal (ignoring attributes)
559+
- 'different': Coordinates which are not equal (ignoring attributes)
560560
across all datasets are also concatenated (as well as all for which
561561
dimension already appears). Beware: this option may load the data
562562
payload of coordinate variables into memory if they are not already
563563
loaded.
564-
* 'all': All coordinate variables will be concatenated, except
564+
- 'all': All coordinate variables will be concatenated, except
565565
those corresponding to other dimensions.
566-
* list of str: The listed coordinate variables will be concatenated,
566+
- list of str: The listed coordinate variables will be concatenated,
567567
in addition the 'minimal' coordinates.
568568
parallel : bool, optional
569569
If True, the open and preprocess steps of this function will be
570570
performed in parallel using ``dask.delayed``. Default is False.
571-
**kwargs : optional
571+
\*\*kwargs : optional
572572
Additional arguments passed on to :py:func:`xarray.open_dataset`.
573573
574574
Returns
@@ -813,14 +813,14 @@ def save_mfdataset(datasets, paths, mode='w', format=None, groups=None,
813813
814814
File format for the resulting netCDF file:
815815
816-
* NETCDF4: Data is stored in an HDF5 file, using netCDF4 API
816+
- NETCDF4: Data is stored in an HDF5 file, using netCDF4 API
817817
features.
818-
* NETCDF4_CLASSIC: Data is stored in an HDF5 file, using only
818+
- NETCDF4_CLASSIC: Data is stored in an HDF5 file, using only
819819
netCDF 3 compatible API features.
820-
* NETCDF3_64BIT: 64-bit offset version of the netCDF 3 file format,
820+
- NETCDF3_64BIT: 64-bit offset version of the netCDF 3 file format,
821821
which fully supports 2+ GB files, but is only compatible with
822822
clients linked against netCDF version 3.6.0 or later.
823-
* NETCDF3_CLASSIC: The classic netCDF 3 file format. It does not
823+
- NETCDF3_CLASSIC: The classic netCDF 3 file format. It does not
824824
handle 2+ GB files very well.
825825
826826
All formats are supported by the netCDF4-python library.

xarray/core/combine.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def concat(objs, dim=None, data_vars='all', coords='different',
3131
as a coordinate.
3232
data_vars : {'minimal', 'different', 'all' or list of str}, optional
3333
These data variables will be concatenated together:
34+
3435
* 'minimal': Only data variables in which the dimension already
3536
appears are included.
3637
* 'different': Data variables which are not equal (ignoring
@@ -41,9 +42,11 @@ def concat(objs, dim=None, data_vars='all', coords='different',
4142
* 'all': All data variables will be concatenated.
4243
* list of str: The listed data variables will be concatenated, in
4344
addition to the 'minimal' data variables.
45+
4446
If objects are DataArrays, data_vars must be 'all'.
4547
coords : {'minimal', 'different', 'all' or list of str}, optional
4648
These coordinate variables will be concatenated together:
49+
4750
* 'minimal': Only coordinates in which the dimension already appears
4851
are included.
4952
* 'different': Coordinates which are not equal (ignoring attributes)

xarray/core/dataarray.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,14 +1703,14 @@ def to_netcdf(self, *args, **kwargs):
17031703
'NETCDF3_CLASSIC'}, optional
17041704
File format for the resulting netCDF file:
17051705
1706-
* NETCDF4: Data is stored in an HDF5 file, using netCDF4 API
1706+
- NETCDF4: Data is stored in an HDF5 file, using netCDF4 API
17071707
features.
1708-
* NETCDF4_CLASSIC: Data is stored in an HDF5 file, using only
1708+
- NETCDF4_CLASSIC: Data is stored in an HDF5 file, using only
17091709
netCDF 3 compatible API features.
1710-
* NETCDF3_64BIT: 64-bit offset version of the netCDF 3 file format,
1710+
- NETCDF3_64BIT: 64-bit offset version of the netCDF 3 file format,
17111711
which fully supports 2+ GB files, but is only compatible with
17121712
clients linked against netCDF version 3.6.0 or later.
1713-
* NETCDF3_CLASSIC: The classic netCDF 3 file format. It does not
1713+
- NETCDF3_CLASSIC: The classic netCDF 3 file format. It does not
17141714
handle 2+ GB files very well.
17151715
17161716
All formats are supported by the netCDF4-python library.

xarray/core/dataset.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,14 +1269,14 @@ def to_netcdf(self, path=None, mode='w', format=None, group=None,
12691269
'NETCDF3_CLASSIC'}, optional
12701270
File format for the resulting netCDF file:
12711271
1272-
* NETCDF4: Data is stored in an HDF5 file, using netCDF4 API
1272+
- NETCDF4: Data is stored in an HDF5 file, using netCDF4 API
12731273
features.
1274-
* NETCDF4_CLASSIC: Data is stored in an HDF5 file, using only
1274+
- NETCDF4_CLASSIC: Data is stored in an HDF5 file, using only
12751275
netCDF 3 compatible API features.
1276-
* NETCDF3_64BIT: 64-bit offset version of the netCDF 3 file format,
1276+
- NETCDF3_64BIT: 64-bit offset version of the netCDF 3 file format,
12771277
which fully supports 2+ GB files, but is only compatible with
12781278
clients linked against netCDF version 3.6.0 or later.
1279-
* NETCDF3_CLASSIC: The classic netCDF 3 file format. It does not
1279+
- NETCDF3_CLASSIC: The classic netCDF 3 file format. It does not
12801280
handle 2+ GB files very well.
12811281
12821282
All formats are supported by the netCDF4-python library.

0 commit comments

Comments
 (0)