Skip to content
Merged
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
2 changes: 1 addition & 1 deletion doc/contribute/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ Then you can do::

git branch -D shiny-new-feature

You need to use a upper-case ``-D`` because the branch was squashed into a
You need to use an upper-case ``-D`` because the branch was squashed into a
single commit before merging. Be careful with this because ``git`` won't warn
you if you accidentally delete an unmerged branch.

Expand Down
8 changes: 4 additions & 4 deletions xarray/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _get_iris_args(attrs):

# TODO: Add converting bounds from xarray to Iris and back
def to_iris(dataarray):
"""Convert a DataArray into a Iris Cube"""
"""Convert a DataArray into an Iris Cube"""
# Iris not a hard dependency
import iris
from iris.fileformats.netcdf import parse_cell_methods
Expand Down Expand Up @@ -119,7 +119,7 @@ def to_iris(dataarray):


def _iris_obj_to_attrs(obj):
"""Return a dictionary of attrs when given a Iris object"""
"""Return a dictionary of attrs when given an Iris object"""
attrs = {"standard_name": obj.standard_name, "long_name": obj.long_name}
if obj.units.calendar:
attrs["calendar"] = obj.units.calendar
Expand All @@ -130,7 +130,7 @@ def _iris_obj_to_attrs(obj):


def _iris_cell_methods_to_str(cell_methods_obj):
"""Converts a Iris cell methods into a string"""
"""Converts an Iris cell methods into a string"""
cell_methods = []
for cell_method in cell_methods_obj:
names = "".join(f"{n}: " for n in cell_method.coord_names)
Expand All @@ -155,7 +155,7 @@ def _name(iris_obj, default="unknown"):


def from_iris(cube):
"""Convert a Iris cube into a DataArray"""
"""Convert an Iris cube into a DataArray"""
import iris.exceptions

name = _name(cube)
Expand Down
Loading