changes to imports

Author: finozzifa

scripts/add_electricity.py

@@ -91,9 +91,15 @@
 import powerplantmatching as pm
 import pypsa
 import xarray as xr
-from _helpers import configure_logging, create_logger, read_csv_nafix, update_p_nom_max
 from powerplantmatching.export import map_country_bus
 
+from scripts._helpers import (
+    configure_logging,
+    create_logger,
+    read_csv_nafix,
+    update_p_nom_max,
+)
+
 idx = pd.IndexSlice
 
 logger = create_logger(__name__)

scripts/add_extra_components.py

@@ -57,8 +57,9 @@
 import numpy as np
 import pandas as pd
 import pypsa
-from _helpers import configure_logging, create_logger
-from add_electricity import (
+
+from scripts._helpers import configure_logging, create_logger
+from scripts.add_electricity import (
     _add_missing_carriers_from_costs,
     add_nice_carrier_names,
     load_costs,

scripts/augmented_line_connections.py

@@ -34,12 +34,13 @@
 import numpy as np
 import pandas as pd
 import pypsa
-from _helpers import configure_logging, create_logger
-from add_electricity import load_costs
 from networkx.algorithms import complement
 from networkx.algorithms.connectivity.edge_augmentation import k_edge_augmentation
 from pypsa.geo import haversine_pts
 
+from scripts._helpers import configure_logging, create_logger
+from scripts.add_electricity import load_costs
+
 logger = create_logger(__name__)
 
 

scripts/base_network.py

@@ -65,9 +65,10 @@
 import scipy as sp
 import shapely.prepared
 import shapely.wkt
-from _helpers import configure_logging, create_logger, read_csv_nafix
 from shapely.ops import unary_union
 
+from scripts._helpers import configure_logging, create_logger, read_csv_nafix
+
 logger = create_logger(__name__)
 
 

scripts/build_bus_regions.py

@@ -47,7 +47,8 @@
 import geopandas as gpd
 import pandas as pd
 import pypsa
-from _helpers import REGION_COLS, configure_logging, create_logger
+
+from scripts._helpers import REGION_COLS, configure_logging, create_logger
 
 logger = create_logger(__name__)
 

scripts/build_cutout.py

@@ -98,7 +98,8 @@
 import atlite
 import geopandas as gpd
 import pandas as pd
-from _helpers import configure_logging, create_logger
+
+from scripts._helpers import configure_logging, create_logger
 
 logger = create_logger(__name__)
 

scripts/build_demand_profiles.py

@@ -49,10 +49,11 @@
 import pypsa
 import scipy.sparse as sparse
 import xarray as xr
-from _helpers import configure_logging, create_logger, read_osm_config
 from shapely.prepared import prep
 from shapely.validation import make_valid
 
+from scripts._helpers import configure_logging, create_logger, read_osm_config
+
 logger = create_logger(__name__)
 
 

scripts/build_natura_raster.py

@@ -50,10 +50,11 @@
 import geopandas as gpd
 import numpy as np
 import rasterio as rio
-from _helpers import configure_logging, create_logger
 from rasterio.features import geometry_mask
 from rasterio.warp import transform_bounds
 
+from scripts._helpers import configure_logging, create_logger
+
 logger = create_logger(__name__)
 
 

scripts/build_osm_network.py

@@ -10,17 +10,18 @@
 import geopandas as gpd
 import numpy as np
 import pandas as pd
-from _helpers import (
+from shapely.geometry import LineString, Point
+from shapely.ops import linemerge, split
+from tqdm import tqdm
+
+from scripts._helpers import (
     configure_logging,
     create_logger,
     read_geojson,
     read_osm_config,
     sets_path_to_root,
     to_csv_nafix,
 )
-from shapely.geometry import LineString, Point
-from shapely.ops import linemerge, split
-from tqdm import tqdm
 
 logger = create_logger(__name__)
 

scripts/build_powerplants.py

@@ -108,15 +108,16 @@
 import powerplantmatching as pm
 import pypsa
 import yaml
-from _helpers import (
+from scipy.spatial import cKDTree as KDTree
+from shapely.geometry import Point
+
+from scripts._helpers import (
     configure_logging,
     create_logger,
     read_csv_nafix,
     to_csv_nafix,
     two_digits_2_name_country,
 )
-from scipy.spatial import cKDTree as KDTree
-from shapely.geometry import Point
 
 logger = create_logger(__name__)
 

scripts/build_renewable_profiles.py

@@ -202,12 +202,13 @@
 import pandas as pd
 import progressbar as pgb
 import xarray as xr
-from _helpers import configure_logging, create_logger, sets_path_to_root
-from add_electricity import load_powerplants
 from dask.distributed import Client, LocalCluster
 from pypsa.geo import haversine
 from shapely.geometry import LineString, Point, box
 
+from scripts._helpers import configure_logging, create_logger, sets_path_to_root
+from scripts.add_electricity import load_powerplants
+
 cc = coco.CountryConverter()
 
 logger = create_logger(__name__)

scripts/build_shapes.py

@@ -18,14 +18,6 @@
 import rasterio
 import requests
 import xarray as xr
-from _helpers import (
-    configure_logging,
-    create_logger,
-    sets_path_to_root,
-    three_2_two_digits_country,
-    two_2_three_digits_country,
-    two_digits_2_name_country,
-)
 from numba import njit
 from numba.core import types
 from numba.typed import Dict
@@ -36,6 +28,15 @@
 from shapely.validation import make_valid
 from tqdm import tqdm
 
+from scripts._helpers import (
+    configure_logging,
+    create_logger,
+    sets_path_to_root,
+    three_2_two_digits_country,
+    two_2_three_digits_country,
+    two_digits_2_name_country,
+)
+
 sets_path_to_root("pypsa-earth")
 
 

scripts/clean_osm_data.py

@@ -11,7 +11,8 @@
 import numpy as np
 import pandas as pd
 import reverse_geocode as rg
-from _helpers import (
+
+from scripts._helpers import (
     REGION_COLS,
     configure_logging,
     create_logger,

scripts/cluster_network.py

@@ -129,16 +129,6 @@
 import pandas as pd
 import pyomo.environ as po
 import pypsa
-from _helpers import (
-    REGION_COLS,
-    configure_logging,
-    create_logger,
-    get_aggregation_strategies,
-    sets_path_to_root,
-    update_p_nom_max,
-)
-from add_electricity import load_costs
-from build_shapes import add_gdp_data, add_population_data
 from pypsa.clustering.spatial import (
     busmap_by_greedy_modularity,
     busmap_by_hac,
@@ -147,6 +137,17 @@
 )
 from shapely.geometry import Point
 
+from scripts._helpers import (
+    REGION_COLS,
+    configure_logging,
+    create_logger,
+    get_aggregation_strategies,
+    sets_path_to_root,
+    update_p_nom_max,
+)
+from scripts.add_electricity import load_costs
+from scripts.build_shapes import add_gdp_data, add_population_data
+
 idx = pd.IndexSlice
 
 logger = create_logger(__name__)

scripts/download_osm_data.py

@@ -30,9 +30,10 @@
 import shutil
 from pathlib import Path
 
-from _helpers import configure_logging, create_logger, read_osm_config
 from earth_osm import eo
 
+from scripts._helpers import configure_logging, create_logger, read_osm_config
+
 logger = create_logger(__name__)
 
 

scripts/make_statistics.py

@@ -31,10 +31,16 @@
 import pandas as pd
 import pypsa
 import xarray as xr
-from _helpers import create_logger, mock_snakemake, sets_path_to_root, to_csv_nafix
-from build_test_configs import create_test_config
 from shapely.validation import make_valid
 
+from scripts._helpers import (
+    create_logger,
+    mock_snakemake,
+    sets_path_to_root,
+    to_csv_nafix,
+)
+from scripts.build_test_configs import create_test_config
+
 logger = create_logger(__name__)
 
 

scripts/make_summary.py

@@ -55,8 +55,9 @@
 
 import pandas as pd
 import pypsa
-from _helpers import configure_logging
-from add_electricity import create_logger, load_costs, update_transmission_costs
+
+from scripts._helpers import configure_logging
+from scripts.add_electricity import create_logger, load_costs, update_transmission_costs
 
 idx = pd.IndexSlice
 

scripts/monte_carlo.py

@@ -74,11 +74,12 @@
 import pandas as pd
 import pypsa
 import seaborn as sns
-from _helpers import configure_logging, create_logger
 from pyDOE2 import lhs
 from scipy.stats import beta, gamma, lognorm, norm, qmc, triang
 from sklearn.preprocessing import MinMaxScaler
-from solve_network import *
+
+from scripts._helpers import configure_logging, create_logger
+from scripts.solve_network import *
 
 logger = create_logger(__name__)
 sns.set(style="whitegrid")

scripts/plot_network.py

@@ -25,15 +25,16 @@
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
-from _helpers import (
+from matplotlib.legend_handler import HandlerPatch
+from matplotlib.patches import Circle, Ellipse
+
+from scripts._helpers import (
     aggregate_costs,
     aggregate_p,
     configure_logging,
     create_logger,
     load_network_for_plots,
 )
-from matplotlib.legend_handler import HandlerPatch
-from matplotlib.patches import Circle, Ellipse
 
 to_rgba = mpl.colors.colorConverter.to_rgba
 

scripts/plot_summary.py

@@ -20,7 +20,8 @@
 
 import matplotlib.pyplot as plt
 import pandas as pd
-from _helpers import configure_logging, create_logger
+
+from scripts._helpers import configure_logging, create_logger
 
 logger = create_logger(__name__)
 

scripts/prepare_network.py

@@ -65,8 +65,9 @@
 import pandas as pd
 import pypsa
 import requests
-from _helpers import configure_logging, create_logger
-from add_electricity import load_costs, update_transmission_costs
+
+from scripts._helpers import configure_logging, create_logger
+from scripts.add_electricity import load_costs, update_transmission_costs
 
 idx = pd.IndexSlice