chore: isort

Merrielle Ondreicka · Merrielle Ondreicka · commit 6309d733210e · 2023-02-27T14:08:21.000-08:00
diff --git a/docs/code/curtailment_eastern.py b/docs/code/curtailment_eastern.py
@@ -1,4 +1,4 @@
-import matplotlib.pyplot as plt
+from matplotlib import pyplot as plt
 from powersimdata import Scenario
 
 from postreise.plot.plot_curtailment_ts import plot_curtailment_time_series
diff --git a/postreise/analyze/generation/tests/test_emissions.py b/postreise/analyze/generation/tests/test_emissions.py
@@ -100,7 +100,6 @@ def test_method_value(self, scenario):
 
 class TestCarbonCalculation:
     def test_carbon_calc_always_on(self, scenario, mock_plant):
-
         carbon = generate_emissions_stats(scenario, method="always-on")
         _test_emissions_structure(carbon, mock_plant, scenario.state.get_pg())
 
@@ -118,7 +117,6 @@ def test_carbon_calc_always_on(self, scenario, mock_plant):
         )
 
     def test_carbon_calc_decommit(self, scenario, mock_plant):
-
         carbon = generate_emissions_stats(scenario, method="decommit")
         _test_emissions_structure(carbon, mock_plant, scenario.state.get_pg())
 
@@ -136,7 +134,6 @@ def test_carbon_calc_decommit(self, scenario, mock_plant):
         )
 
     def test_carbon_calc_simple(self, scenario, mock_plant):
-
         carbon = generate_emissions_stats(scenario, method="simple")
         _test_emissions_structure(carbon, mock_plant, scenario.state.get_pg())
 
diff --git a/postreise/plot/plot_bar_generation_max_min_actual.py b/postreise/plot/plot_bar_generation_max_min_actual.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.input.check import _check_resources_are_in_grid_and_format
 
 from postreise.analyze.generation.summarize import (
diff --git a/postreise/plot/plot_bar_generation_stack.py b/postreise/plot/plot_bar_generation_stack.py
@@ -1,7 +1,7 @@
 import os
 
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.network.model import ModelImmutables, area_to_loadzone
 from powersimdata.scenario.scenario import Scenario
 
diff --git a/postreise/plot/plot_bar_generation_vs_capacity.py b/postreise/plot/plot_bar_generation_vs_capacity.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.network.model import ModelImmutables, area_to_loadzone
 from powersimdata.scenario.scenario import Scenario
 
diff --git a/postreise/plot/plot_bar_renewable_max_profile_actual.py b/postreise/plot/plot_bar_renewable_max_profile_actual.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.input.check import (
     _check_resources_are_in_grid_and_format,
     _check_resources_are_renewable_and_format,
diff --git a/postreise/plot/plot_bar_shortfall.py b/postreise/plot/plot_bar_shortfall.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.design.generation.clean_capacity_scaling import (
     add_demand_to_targets,
     add_resource_data_to_targets,
diff --git a/postreise/plot/plot_carbon_map.py b/postreise/plot/plot_carbon_map.py
@@ -1,15 +1,15 @@
 import numpy as np
 import pandas as pd
 from bokeh.models import ColumnDataSource, HoverTool
+from powersimdata.network.constants.carrier.resource import EUResource, USAResource
 from powersimdata.scenario.check import _check_scenario_is_in_analyze_state
-from powersimdata.network.constants.carrier.resource import USAResource, EUResource
 
 from postreise.analyze.generation.emissions import (
     generate_emissions_stats,
     summarize_emissions_by_bus,
 )
 from postreise.plot.canvas import create_map_canvas
-from postreise.plot.colors import be_green, be_red, be_purple
+from postreise.plot.colors import be_green, be_purple, be_red
 from postreise.plot.plot_borders import add_borders
 from postreise.plot.projection_helpers import project_bus
 
diff --git a/postreise/plot/plot_curtailment_ts.py b/postreise/plot/plot_curtailment_ts.py
@@ -1,7 +1,7 @@
 import os
 
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.input.check import _check_resources_and_format
 from powersimdata.network.model import ModelImmutables
 from powersimdata.scenario.check import _check_scenario_is_in_analyze_state
diff --git a/postreise/plot/plot_energy_carbon_stack.py b/postreise/plot/plot_energy_carbon_stack.py
@@ -1,8 +1,8 @@
 # This plotting module has a corresponding demo notebook in
 #   PostREISE/postreise/plot/demo: energy_emissions_stack_bar_demo.ipynb
 
-import matplotlib.pyplot as plt
 import numpy as np
+from matplotlib import pyplot as plt
 from powersimdata.network.model import ModelImmutables
 from powersimdata.scenario.scenario import Scenario
 
diff --git a/postreise/plot/plot_generation_ts_stack.py b/postreise/plot/plot_generation_ts_stack.py
@@ -1,8 +1,8 @@
 import os
 
-import matplotlib.patches as mpatches
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import patches as mpatches
+from matplotlib import pyplot as plt
 from powersimdata.network.model import ModelImmutables
 from powersimdata.scenario.check import _check_scenario_is_in_analyze_state
 
diff --git a/postreise/plot/plot_heatmap.py b/postreise/plot/plot_heatmap.py
@@ -1,8 +1,8 @@
 import datetime as dt
 
-import matplotlib.dates as mdates
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import dates as mdates
+from matplotlib import pyplot as plt
 from powersimdata.input.check import _check_time_series
 
 from postreise.analyze.time import change_time_zone
diff --git a/postreise/plot/plot_pie_generation_vs_capacity.py b/postreise/plot/plot_pie_generation_vs_capacity.py
@@ -1,6 +1,6 @@
-import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.network.model import ModelImmutables, area_to_loadzone
 from powersimdata.scenario.scenario import Scenario
 
diff --git a/postreise/plot/plot_scatter_capacity_vs_capacity_factor.py b/postreise/plot/plot_scatter_capacity_vs_capacity_factor.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.input.helpers import get_plant_id_for_resources_in_area
 from powersimdata.scenario.check import _check_scenario_is_in_analyze_state
 
diff --git a/postreise/plot/plot_scatter_capacity_vs_cost_curve_slope.py b/postreise/plot/plot_scatter_capacity_vs_cost_curve_slope.py
@@ -1,4 +1,4 @@
-import matplotlib.pyplot as plt
+from matplotlib import pyplot as plt
 from powersimdata.input.helpers import get_plant_id_for_resources_in_area
 from powersimdata.scenario.check import _check_scenario_is_in_analyze_state
 
diff --git a/postreise/plot/plot_scatter_capacity_vs_curtailment.py b/postreise/plot/plot_scatter_capacity_vs_curtailment.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 from powersimdata.input.check import _check_resources_are_renewable_and_format
 from powersimdata.input.helpers import get_plant_id_for_resources_in_area
 from powersimdata.scenario.check import _check_scenario_is_in_analyze_state
diff --git a/postreise/plot/plot_sim_vs_hist.py b/postreise/plot/plot_sim_vs_hist.py
@@ -1,6 +1,6 @@
-import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
+from matplotlib import pyplot as plt
 
 from postreise.analyze.generation.summarize import sum_generation_by_state
 
diff --git a/postreise/plot/plot_tornado.py b/postreise/plot/plot_tornado.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pandas as pd
+from matplotlib import pyplot as plt
 
 
 def plot_tornado(title, data, sorted=False, plot_show=True):
@@ -48,7 +48,7 @@ def plot_tornado(title, data, sorted=False, plot_show=True):
     ax.set_yticks([])
     ax.axvline(x=0, color="black", lw=0.8)
 
-    for (p, resource) in zip(ax.patches, list(df.index)):
+    for p, resource in zip(ax.patches, list(df.index)):
         b = p.get_bbox()
         x_pos = b.x1 if b.x1 >= 0 else b.x0
         val = "%.2e" % b.x1
diff --git a/postreise/plot/tests/conftest.py b/postreise/plot/tests/conftest.py
@@ -1,5 +1,5 @@
-import matplotlib.pyplot as plt
 import pytest
+from matplotlib import pyplot as plt
 
 
 @pytest.fixture(autouse=True)
diff --git a/postreise/plot/tests/test_canvas.py b/postreise/plot/tests/test_canvas.py
@@ -1,5 +1,5 @@
-import bokeh.plotting as plt
 import pytest
+from bokeh import plotting as plt
 
 from postreise.plot.canvas import create_map_canvas
 
diff --git a/postreise/plot/tests/test_plot_capacity_map.py b/postreise/plot/tests/test_plot_capacity_map.py
@@ -1,5 +1,5 @@
-import bokeh.plotting as plt
 import pytest
+from bokeh import plotting as plt
 from powersimdata.tests.mock_scenario import MockScenario
 
 from postreise.plot.plot_capacity_map import map_plant_capacity

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import matplotlib.pyplot as plt`
	`1`	`+from matplotlib import pyplot as plt`
`2`	`2`	`from powersimdata import Scenario`
`3`	`3`
`4`	`4`	`from postreise.plot.plot_curtailment_ts import plot_curtailment_time_series`