Skip to content

minimal data requirements and small pixi fix #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
energyLS merged 3 commits into from
Aug 10, 2026
Merged

minimal data requirements and small pixi fix #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89e4d18
build: add papermill dependency for notebook-based Snakemake rules
JanTautorus Aug 5, 2026
b8735aa
fix: honor configured cost_year in trade model and steel-demand notebook
JanTautorus Aug 5, 2026
4d2e940
fix: declare UNIDO raw data as an explicit Snakemake input
JanTautorus Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions pixi.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ netcdf4 = ">=1.7.2,!=1.7.4"
networkx = ">=3.5"
numpy = ">=1.26.4"
pandas = ">=2.1"
papermill = "*"
pycountry = ">=24.6.1"
pypsa = ">=1.1.2"
python = ">=3.10"
Expand Down
2 changes: 2 additions & 0 deletions rules/preparation.smk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@


rule download_labour_data:
input:
unido_raw="data/labour/unido-raw/data.csv",
output:
merged="resources/merged_labour_inputs.csv",
threads: 1
Expand Down
2 changes: 0 additions & 2 deletions rules/trade_model.smk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ rule model_trade:
supply_curves_interone=expand(
"resources/supply_curves/cost_year~{cost_year}/wacc~{wacc}/{region}_marginal_cost_{interone}.csv",
allow_missing=True,
cost_year=[2050],
region=config["regions"],
interone=["hbi"],
),
supply_curves_intertwo=expand(
"resources/supply_curves/cost_year~{cost_year}/wacc~{wacc}/{region}_marginal_cost_{intertwo}.csv",
allow_missing=True,
cost_year=[2050],
region=config["regions"],
intertwo=["steel"],
),
Expand Down
9 changes: 5 additions & 4 deletions workflow/notebooks/prepare-steel-demand.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
"metadata": {},
"outputs": [],
"source": [
"from _helpers_notebooks import mock_snakemake\n",
"snakemake = mock_snakemake(\n",
" \"prepare_steel_demand\",\n",
" cost_year = 2050,\n",
"if \"snakemake\" not in globals():\n",
" from _helpers_notebooks import mock_snakemake\n",
" snakemake = mock_snakemake(\n",
" \"prepare_steel_demand\",\n",
" cost_year=2050,\n",
" )"
]
},
Expand Down
1 change: 1 addition & 0 deletions workflow/scripts/download_labour_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,5 +760,6 @@ def merge_all_data(

merge_all_data(
target_year=2020,
unido_filepath=snakemake.input.unido_raw,
output_filepath=snakemake.output.merged,
)
Loading