cleanup

benchmarks.yml

@@ -279,42 +279,3 @@ benchmarks:
       - "SuppXLS/Scen_B_TRA_EV_Parity.xlsx"
       - "SuppXLS/Scen_B_TRA_F_ModalShares.xlsx"
     dd_folder: Ireland
-
-  - name: AusTIMES
-    input_folder: ../../../austimes-lfs
-    regions: "ACT"
-    inputs:
-      - "VT_AUS_COM.xlsx"
-      - "VT_AUS_ELC.xlsx"
-      - "VT_AUS_IND.xlsm"
-      - "VT_AUS_RES.xlsx"
-      - "VT_AUS_TRA.xlsx"
-      - "SysSettings.xlsx"
-      - "SuppXLS/Scen_Par-austimes_CCA.xlsx"
-      - "SuppXLS/Scen_nsv-austimes_csiro_1.xlsx"
-      - "SuppXLS/Scen_nsv-austimes-cwc_1.xlsx"
-      - "SuppXLS/Scen_Base-Electricity.xlsx"
-      - "SuppXLS/Scen_Base-Industry.xlsx"
-      - "SuppXLS/Scen_Base-Transport.xlsx"
-      - "SuppXLS/Scen_CoalPlants_LE-control_disable.xlsx"
-      - "SuppXLS/Scen_Hydrogen.xlsx"
-      - "SuppXLS/Scen_revMinCoalfactors.xlsx"
-      - "SuppXLS/Scen_revMinGPGfactors.xlsx"
-      - "SuppXLS/Scen_Transport_Base_Liq-LevPlayFld_v16.xlsx"
-      - "SuppXLS/Scen_Transport_SteadyProgress.xlsx"
-      - "SuppXLS/Scen_TransportPolicies.xlsx"
-      - "SuppXLS/Scen_xComSolarWeighting-TG17-base.xlsx"
-      - "SuppXLS/Scen_xComSolarWeighting-TG17-xScale.xlsx"
-      - "SuppXLS/Scen_xICEcostAdj.xlsx"
-      - "SuppXLS/Scen_zScalingCorrection.xlsx"
-      - "SuppXLS/Scen_zzdisable2options.xlsx"
-      - "SubRES_Tmpl/SubRES_CoalGasDomExp.xlsx"
-      - "SubRES_Tmpl/SubRES_CoalPlants-Ret-and_lifeExt.xlsx"
-      - "SubRES_Tmpl/SubRES_ElecFossil.xlsx"
-      - "SubRES_Tmpl/SubRES_ETI_Techs.xlsx"
-      - "SubRES_Tmpl/SubRES_Frontier-Levers.xlsx"
-      - "SubRES_Tmpl/SubRES_Hydrogen_production.xlsx"
-      - "SubRES_Tmpl/SubRES_PumpedStorage.xlsx"
-      - "SubRES_Tmpl/SubRES_WindSolarWave.xlsx"
-      - "SuppXLS/Trades/ScenTrade_TradeParm.xlsx"
-    dd_folder: austimes

pyproject.toml

@@ -60,7 +60,7 @@ line-length = 150  # increase default line wrap length for legibility
 # Automation of common dev tasks etc.
 # Run with: `poe <target>`, e,g. `poe lint` or `poe benchmark Ireland`.
 # See https://github.com/nat-n/poethepoet for details.
-benchmark = { cmd = "python utils/run_benchmarks.py benchmarks.yml --verbose --run", help = "Run a single benchmark.  Usage: poe benchmark <benchmark_name>" }
+benchmark = { cmd = "python utils/run_benchmarks.py benchmarks.yml --run", help = "Run a single benchmark.  Usage: poe benchmark <benchmark_name>" }
 benchmark_all = { shell = "python utils/run_benchmarks.py benchmarks.yml --verbose | tee out.txt", help = "Run the project", interpreter = "posix" }
 lint = { shell = "git add .pre-commit-config.yaml & pre-commit run", help = "Run pre-commit hooks", interpreter = "posix" }
 test = { cmd = "pytest --cov-report term --cov-report html --cov=xl2times --cov=utils", help = "Run unit tests with pytest" }

tests/test_transforms.py

@@ -78,10 +78,10 @@ def test_uc_wildcards(self):
             dictionary = pickle.load(f)
         df = df_in.copy()
 
-        df_in = pd.read_parquet("tests/data/process_uc_wildcards_austimes_data.parquet")
-        with open("tests/data/process_uc_wildcards_austimes_dict.pkl", "rb") as f:
-            dictionary = pickle.load(f)
-        df = df_in.query()
+        # df_in = pd.read_parquet("tests/data/process_uc_wildcards_austimes_data.parquet")
+        # with open("tests/data/process_uc_wildcards_austimes_dict.pkl", "rb") as f:
+        #     dictionary = pickle.load(f)
+        # df = df_in.query("region in ['ACT', 'NSW']")
 
         t0 = datetime.now()
 

utils/run_benchmarks.py

@@ -22,17 +22,6 @@
 
 from xl2times.utils import max_workers
 
-# configure logger
-# logging.basicConfig(
-#     level=logging.DEBUG,
-#     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s - %(filename)s:%(lineno)d",
-#     handlers=[StreamHandler(), RotatingFileHandler("xl2times.log", maxBytes=1000000, backupCount=5)],
-#     force=True,
-#     datefmt="%Y-%m-%d %H:%M:%S",
-# )
-# logger = logging.getLogger("xl2times")
-# logger.info("Logger!")
-
 from loguru import logger
 
 # set global log level via env var.  Set to INFO if not already set.