Skip to content

Commit

Permalink
Properly sort imports this time!
Browse files Browse the repository at this point in the history
  • Loading branch information
bje- committed Oct 24, 2024
1 parent bfcc2ca commit 54e0db0
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 30 deletions.
30 changes: 6 additions & 24 deletions nemo/scenarios.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,12 @@
"""Supply side scenarios."""

from nemo import configfile, regions
from nemo.generators import (
CCGT,
CCGT_CCS,
CST,
OCGT,
Biofuel,
Black_Coal,
CentralReceiver,
Coal_CCS,
DemandResponse,
Hydro,
PumpedHydroPump,
PumpedHydroTurbine,
PV1Axis,
Wind,
WindOffshore,
)
from nemo.polygons import (
WILDCARD,
cst_limit,
offshore_wind_limit,
pv_limit,
wind_limit,
)
from nemo.generators import (CCGT, CCGT_CCS, CST, OCGT, Biofuel, Black_Coal,
CentralReceiver, Coal_CCS, DemandResponse, Hydro,
PumpedHydroPump, PumpedHydroTurbine, PV1Axis,
Wind, WindOffshore)
from nemo.polygons import (WILDCARD, cst_limit, offshore_wind_limit, pv_limit,
wind_limit)
from nemo.storage import PumpedHydroStorage
from nemo.types import UnreachableError

Expand Down
3 changes: 2 additions & 1 deletion tests/test_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

import unittest

import nemo
import numpy as np
import pandas as pd

import nemo
from nemo import regions


Expand Down
4 changes: 2 additions & 2 deletions tests/test_generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

import numpy as np
import pandas as pd
from nemo import costs, generators, storage

import tcpserver

from nemo import costs, generators, storage

PORT = 9998
battery_storage = storage.BatteryStorage(800, "Li-ion store")
hydrogen_storage = storage.HydrogenStorage(1000, "H2 store")
Expand Down
4 changes: 2 additions & 2 deletions tests/test_nem.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import importlib
import unittest

from nemo import nem

import tcpserver

from nemo import nem

PORT = 9998


Expand Down
3 changes: 2 additions & 1 deletion tests/test_penalties.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@

import unittest

import nemo
import numpy as np

import nemo
from nemo import generators, penalties, regions, storage
from nemo.penalties import reasons
from nemo.polygons import WILDCARD
Expand Down
1 change: 1 addition & 0 deletions tests/test_sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import numpy as np
import pandas as pd

from nemo import configfile, generators, sim, storage
from nemo.context import Context

Expand Down
1 change: 1 addition & 0 deletions tests/test_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import unittest

import pandas as pd

from nemo import configfile, generators, storage
from nemo.polygons import WILDCARD

Expand Down
1 change: 1 addition & 0 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from pathlib import Path

import pytest

from nemo import context, scenarios, sim, utils


Expand Down

0 comments on commit 54e0db0

Please sign in to comment.