Skip to content

Commit

Permalink
blacken
Browse files Browse the repository at this point in the history
  • Loading branch information
jonmmease committed Apr 10, 2020
1 parent 71ea4a4 commit ecdfca2
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 22 deletions.
3 changes: 1 addition & 2 deletions packages/python/plotly/plotly/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@

# Set default template (for >= 3.7 this is done in ploty/io/__init__.py)
from plotly.io import templates

templates._default = "plotly"
else:
__all__, __getattr__ = relative_import(
Expand All @@ -80,5 +81,3 @@
# Trigger docstring generation
# TODO: come back to _docstring_gen
# from plotly import _docstring_gen


1 change: 1 addition & 0 deletions packages/python/plotly/plotly/io/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,5 @@

# Set default template (for < 3.7 this is done in ploty/__init__.py)
from plotly.io import templates

templates._default = "plotly"
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

def build_invalid_fig():
return go.Figure(
data=[{'type': 'bar', 'y': 'not_a_list', 'bogus': 23}],
layout_title_text='valid title',
layout_colorway='not a dict',
data=[{"type": "bar", "y": "not_a_list", "bogus": 23}],
layout_title_text="valid title",
layout_colorway="not a dict",
)


expected_invalid_dict = dict(
data=[{'type': 'bar', 'y': 'not_a_list', 'bogus': 23}],
layout={'title': {'text': 'valid title'}, 'colorway': 'not a dict'}
data=[{"type": "bar", "y": "not_a_list", "bogus": 23}],
layout={"title": {"text": "valid title"}, "colorway": "not a dict"},
)


Expand Down
21 changes: 12 additions & 9 deletions packages/python/plotly/test_init/test_dependencies_not_imported.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,30 @@ def test_dependencies_not_imported():

# Check that creating a figure without using numpy and pandas does not result in
# the import of numpy and pandas, even if they are installed.
assert 'plotly' not in sys.modules
assert 'numpy' not in sys.modules
assert 'pandas' not in sys.modules
assert "plotly" not in sys.modules
assert "numpy" not in sys.modules
assert "pandas" not in sys.modules

import plotly.graph_objects as go

fig = go.Figure().add_scatter(x=[0], y=[1])
fig.to_json()

assert 'plotly' in sys.modules
assert 'numpy' not in sys.modules
assert 'pandas' not in sys.modules
assert "plotly" in sys.modules
assert "numpy" not in sys.modules
assert "pandas" not in sys.modules

# check that numpy is installed
import numpy as np

fig = go.Figure().add_scatter(x=np.array([0]), y=np.array([1]))
fig.to_json()
assert 'numpy' in sys.modules
assert 'pandas' not in sys.modules
assert "numpy" in sys.modules
assert "pandas" not in sys.modules

# check that pandas is installed
import pandas as pd

fig = go.Figure().add_scatter(x=pd.Series([0]), y=pd.Series([1]))
fig.to_json()
assert 'pandas' in sys.modules
assert "pandas" in sys.modules
13 changes: 7 additions & 6 deletions packages/python/plotly/test_init/test_lazy_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@
def test_lazy_imports():

# plotly not imported yet
assert 'plotly' not in sys.modules
assert "plotly" not in sys.modules

# Import top-level plotly module
import plotly
assert 'plotly' in sys.modules

assert "plotly" in sys.modules

# Check that submodules are not auto-imported, but can be be accessed using
# attribute syntax
submodules = ['graph_objs', 'io', 'express']
submodules = ["graph_objs", "io", "express"]
for m in submodules:
module_str = 'plotly.' + m
module_str = "plotly." + m
assert module_str not in sys.modules

getattr(plotly, m)
Expand All @@ -25,9 +26,9 @@ def test_lazy_imports():
# Check that constructing and serializing empty figure doesn't auto-import
# nested graph objects
plotly.graph_objects.Figure().to_json()
submodules = [('layout', 'title'), ('scatter', 'marker'), ('scattergl', 'marker')]
submodules = [("layout", "title"), ("scatter", "marker"), ("scattergl", "marker")]
for module_parts in submodules:
module_str = 'plotly.graph_objs.' + '.'.join(module_parts)
module_str = "plotly.graph_objs." + ".".join(module_parts)
assert module_str not in sys.modules

# Use getattr to
Expand Down

0 comments on commit ecdfca2

Please sign in to comment.