diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index 85de566fe..ec5b4cdf0 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -14,10 +14,10 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ secrets.REGISTRY_USER }} diff --git a/README.md b/README.md index 34b998185..6de82672e 100644 --- a/README.md +++ b/README.md @@ -187,322 +187,396 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - SermishaNarayana -
- Null - - 		- - davide-f -
- Davide-f - - 		- - ekatef -
- Ekaterina - - 		- - pz-max -
- Max Parzen - - 		- - DeniseGiub -
- DeniseGiub - - 		- - yerbol-akhmetov -
- Yerbol Akhmetov - -
- - GbotemiB -
- Emmanuel Bolarinwa - - 		- - mnm-matin -
- Mnm-matin - - 		- - hazemakhalek -
- Hazem - - 		- - energyLS -
- EnergyLS - - 		- - Tomkourou -
- Thomas Kouroughli - - 		- - GridGrapher -
- GridGrapher - -
- - martacki -
- Martha Frysztacki - - 		- - finozzifa -
- Finozzifa - - 		- - Emre-Yorat89 -
- Emre_Yorat - - 		- - virio-andreyana -
- Null - - 		- - giacfalk -
- Giacomo Falchetta - - 		- - Ekaterina-Vo -
- Ekaterina-Vo - -
- - cpschau -
- Cschau - - 		- - euronion -
- Euronion - - 		- - AnasAlgarei -
- AnasAlgarei - - 		- - LukasFrankenQ -
- Lukas Franken - - 		- - Tooblippe -
- Tobias - - 		- - doneachh -
- Anton Achhammer - -
- - koen-vg -
- Koen Van Greevenbroek - - 		- - carlosfv92 -
- Carlos Fernandez - - 		- - koen-vg -
- Koen Van Greevenbroek - - 		- - asolavi -
- Null - - 		- - Netotse -
- Null - -
- - pitmonticone -
- Pietro Monticone - - 		- - siddharth-krishna -
- Siddharth Krishna - -
- - squoilin -
- Sylvain Quoilin - - 		- - juli-a-ko -
- Juli-a-ko - - 		- - ollie-bell -
- Null - - 		- - rsparks3 -
- Ryan - - 		- - stephenjlee -
- Stephen J Lee - - 		- - kma33 -
- Katherine M. Antonio - -
- - jessLryan -
- Jess - - 		- - jarry7 -
- Jarrad Wright - - 		- - HanaElattar -
- HanaElattar - - 		- - FabianHofmann -
- Fabian Hofmann - - 		- - EmreYorat -
- EmreYorat - - 		- - AndreCNF -
- André Cristóvão Neves Ferreira - -
- - AlexanderMeisinger -
- Null - -
+ + FabianHofmann +
+ Fabian Hofmann + + 		+ + fneum +
+ Fabian Neumann + + 		+ + ekatef +
+ Ekaterina + + 		+ + euronion +
+ Euronion + + 		+ + Justus-coded +
+ Justus Ilemobayo + + 		+ + mnm-matin +
+ Mnm-matin + +
+ + martacki +
+ Martha Frysztacki + + 		+ + LukasFrankenQ +
+ Lukas Franken + + 		+ + pz-max +
+ Max Parzen + + 		+ + davide-f +
+ Davide-f + + 		+ + koen-vg +
+ Koen Van Greevenbroek + + 		+ + Eddy-JV +
+ Eddy Jalbout + +
+ + hazemakhalek +
+ Hazem + + 		+ + energyLS +
+ EnergyLS + + 		+ + AnasAlgarei +
+ AnasAlgarei + + 		+ + yerbol-akhmetov +
+ Yerbol Akhmetov + + 		+ + GbotemiB +
+ Emmanuel Bolarinwa + + 		+ + DeniseGiub +
+ DeniseGiub + +
+ + doneachh +
+ Anton Achhammer + + 		+ + Tomkourou +
+ Thomas Kouroughli + + 		+ + finozzifa +
+ Finozzifa + + 		+ + GridGrapher +
+ GridGrapher + + 		+ + drifter089 +
+ Akshat Mittal + + 		+ + glenkiely-ieg +
+ glenkiely-ieg + +
+ + cpschau +
+ Cschau + + 		+ + Emre-Yorat89 +
+ Emre_Yorat + + 		+ + virio-andreyana +
+ Null + + 		+ + giacfalk +
+ Giacomo Falchetta + + 		+ + Ekaterina-Vo +
+ Ekaterina-Vo + + 		+ + lkstrp +
+ Lukas Trippe + +
+ + Tooblippe +
+ Tobias + + 		+ + arizeosalac +
+ zeosalac + + 		+ + danielelerede-oet +
+ danielelerede-oet + + 		+ + carlosfv92 +
+ Carlos Fernandez + + 		+ + rajesh-ieg +
+ rajesh-ieg + + 		+ + asolavi +
+ Null + +
+ + stephenjlee +
+ Stephen J Lee + + 		+ + rsparks3 +
+ Ryan + + 		+ + ollie-bell +
+ Null + + 		+ + juli-a-ko +
+ Juli-a-ko + + 		+ + squoilin +
+ Sylvain Quoilin + + 		+ + siddharth-krishna +
+ Siddharth Krishna + +
+ + SermishaNarayana +
+ Null + + 		+ + pitmonticone +
+ Pietro Monticone + + 		+ + Netotse +
+ Null + + 		+ + milyas009 +
+ Muhammad Ilyas + + 		+ + kma33 +
+ Katherine M. Antonio + + 		+ + jessLryan +
+ Jess + +
+ + jarry7 +
+ Jarrad Wright + + 		+ + HanaElattar +
+ HanaElattar + + 		+ + EmreYorat +
+ EmreYorat + + 		+ + AndreCNF +
+ André Cristóvão Neves Ferreira + + 		+ + AlexanderMeisinger +
+ Null + +
diff --git a/Snakefile b/Snakefile index 1ce387d24..8f528e4ad 100644 --- a/Snakefile +++ b/Snakefile @@ -1361,6 +1361,7 @@ rule build_base_energy_totals: unsd_paths="data/demand/unsd/paths/Energy_Statistics_Database.xlsx", output: energy_totals_base="resources/" + SECDIR + "energy_totals_base.csv", + unsd_export_path=directory("data/demand/unsd/data/"), script: "scripts/build_base_energy_totals.py" @@ -1880,7 +1881,7 @@ rule build_base_industry_totals: #default data input: #os.path.dirname(snakemake.input["transactions_path"]) + "/demand/unsd/data/" #industrial_production_per_country="data/industrial_production_per_country.csv", - unsd_path="data/demand/unsd/data/", + unsd_export_path="data/demand/unsd/data/", energy_totals_base="resources/" + SECDIR + "energy_totals_base.csv", transactions_path="data/unsd_transactions.csv", output: diff --git a/scripts/build_base_industry_totals.py b/scripts/build_base_industry_totals.py index 1e5eda9a8..977f95ea8 100644 --- a/scripts/build_base_industry_totals.py +++ b/scripts/build_base_industry_totals.py @@ -117,7 +117,7 @@ def create_industry_base_totals(df): renaming_dit = transaction.set_index("Transaction")["clean_name"].to_dict() clean_industry_list = list(transaction.clean_name.unique()) - unsd_path = snakemake.input.unsd_path + unsd_path = snakemake.input.unsd_export_path # Get the files from the path provided in the OP all_files = list(Path(unsd_path).glob("*.txt"))