Skip to content

Commit

Permalink
Turn on html repr by default (#3812)
Browse files Browse the repository at this point in the history
* Turn on html repr by default

* Add By line to release docs

* Change tests to expect html as the default display_style
  • Loading branch information
jsignell authored Mar 2, 2020
1 parent 8512b7b commit b155853
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
5 changes: 5 additions & 0 deletions doc/whats-new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ New Features
often means a user is attempting to pass multiple dimensions to group over
and should instead pass a list.
By `Maximilian Roos <https://github.com/max-sixty>`_
- The new ``Dataset._repr_html_`` and ``DataArray._repr_html_`` (introduced
in 0.14.1) is now on by default. To disable, use
``xarray.set_options(display_style="text")``.
By `Julia Signell <https://github.com/jsignell>`_.


Bug fixes
~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion xarray/core/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
CMAP_SEQUENTIAL: "viridis",
CMAP_DIVERGENT: "RdBu_r",
KEEP_ATTRS: "default",
DISPLAY_STYLE: "text",
DISPLAY_STYLE: "html",
}

_JOIN_OPTIONS = frozenset(["inner", "outer", "left", "right", "exact"])
Expand Down
22 changes: 12 additions & 10 deletions xarray/tests/test_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ def test_nested_options():


def test_display_style():
original = "text"
original = "html"
assert OPTIONS["display_style"] == original
with pytest.raises(ValueError):
xarray.set_options(display_style="invalid_str")
with xarray.set_options(display_style="html"):
assert OPTIONS["display_style"] == "html"
with xarray.set_options(display_style="text"):
assert OPTIONS["display_style"] == "text"
assert OPTIONS["display_style"] == original


Expand Down Expand Up @@ -177,10 +177,11 @@ def test_merge_attr_retention(self):

def test_display_style_text(self):
ds = create_test_dataset_attrs()
text = ds._repr_html_()
assert text.startswith("<pre>")
assert "&#x27;nested&#x27;" in text
assert "&lt;xarray.Dataset&gt;" in text
with xarray.set_options(display_style="text"):
text = ds._repr_html_()
assert text.startswith("<pre>")
assert "&#x27;nested&#x27;" in text
assert "&lt;xarray.Dataset&gt;" in text

def test_display_style_html(self):
ds = create_test_dataset_attrs()
Expand All @@ -191,9 +192,10 @@ def test_display_style_html(self):

def test_display_dataarray_style_text(self):
da = create_test_dataarray_attrs()
text = da._repr_html_()
assert text.startswith("<pre>")
assert "&lt;xarray.DataArray &#x27;var1&#x27;" in text
with xarray.set_options(display_style="text"):
text = da._repr_html_()
assert text.startswith("<pre>")
assert "&lt;xarray.DataArray &#x27;var1&#x27;" in text

def test_display_dataarray_style_html(self):
da = create_test_dataarray_attrs()
Expand Down

0 comments on commit b155853

Please sign in to comment.