Skip to content
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.

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

Merge the Merge #1086

Merged
merged 1,667 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1667 commits
Select commit Hold shift + click to select a range
4100463
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 29, 2024
b9772f1
Comment add_brownfield to bypass linter
davide-f May 29, 2024
fc126f1
Add myopic test
davide-f May 29, 2024
f29ff3c
Revise irena and minor fixes
davide-f May 29, 2024
03d17e8
Revise test name
davide-f May 30, 2024
cbef62e
Add existing_heating
davide-f May 30, 2024
ebad154
implement review suggesstions
hazemakhalek May 30, 2024
12a0321
bug fix in solve_network with reference case
hazemakhalek May 30, 2024
90034a8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 30, 2024
b9e881c
Update submodule
davide-f May 30, 2024
490df63
Add zeros for missing entries - aluminium
davide-f May 30, 2024
3c90ca4
Merge pull request #285 from pypsa-meets-earth/run_africa
davide-f May 30, 2024
d4a6e5b
Merge remote-tracking branch 'origin/main' into multiyear
davide-f May 30, 2024
db85557
Merge branch 'main' into redesign_h2policy
hazemakhalek May 31, 2024
989ea8d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 31, 2024
247a319
adding missing templates
hazemakhalek May 31, 2024
23e386d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 31, 2024
5bd4f81
Merge pull request #307 from pypsa-meets-earth/redesign_h2policy
Eddy-JV May 31, 2024
0600f44
Merge branch 'main' into adaptations_to_industry_demand
hazemakhalek May 31, 2024
31a3354
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 31, 2024
a366595
Merge branch 'pypsa-meets-earth:main' into issue_312_use_single_config
finozzifa May 31, 2024
79a0a6d
fix MissingOutputException
doneachh May 31, 2024
cad684a
Merge pull request #313 from finozzifa/issue_312_use_single_config
davide-f Jun 5, 2024
22f56ba
fix TypeError (#321)
doneachh Jun 7, 2024
2227da7
solve pandas deprecations
finozzifa Jun 10, 2024
301c416
Add Params for Rule add_export.py
Eddy-JV Jun 11, 2024
be930cc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
2e73b02
Add Params to Rule build_base_energy_totals
Eddy-JV Jun 11, 2024
20a2b46
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
7977b1f
Add Params to Rule build_base_industry_totals
Eddy-JV Jun 11, 2024
1985f0e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
019889e
Add Params to Rule build_cop_profiles
Eddy-JV Jun 11, 2024
f6bdadf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
0ec507e
Add Params to Rule build_heat_demand
Eddy-JV Jun 11, 2024
ddd1212
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
6e5fdc3
Add Params to build_industrial_distribution_key
Eddy-JV Jun 11, 2024
b188350
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
087b344
Add Params to build_industry_demand
Eddy-JV Jun 11, 2024
b8a3e0e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
1552c24
Add Params and urban_percentage effect all Rules
Eddy-JV Jun 11, 2024
674f941
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
8bc9093
Add Params to build_ship_profile
Eddy-JV Jun 11, 2024
eb9e6fe
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
38ab042
Add Params build_solar_thermal_profiles
Eddy-JV Jun 11, 2024
b656f13
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
1d832ed
Add Params to build_temperature_profiles
Eddy-JV Jun 11, 2024
ec85b06
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
0a8379a
Add Params to copy_config
Eddy-JV Jun 11, 2024
a9f41d5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
514e68e
Add Params make_summary
Eddy-JV Jun 11, 2024
6f3bc10
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
6cacfc0
Add to override_respot + panning_horizons wildcard
Eddy-JV Jun 11, 2024
a365db5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 11, 2024
2cd95c9
Update Snakefile
Eddy-JV Jun 11, 2024
3528981
Update Snakefile
Eddy-JV Jun 11, 2024
b8e719b
Add Params to prepare_airports
Eddy-JV Jun 12, 2024
d5dae19
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
8ed4dbc
Add Params to prepare_gas_network
Eddy-JV Jun 12, 2024
9c72c76
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
9f5fb3f
Add Params to prepare_db and energy_totals
Eddy-JV Jun 12, 2024
e18d8dd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
e937d6c
Merge pull request #332 from pypsa-meets-earth/Params_build_base_ener…
energyLS Jun 12, 2024
7033330
Merge pull request #333 from pypsa-meets-earth/Params_build_base_indu…
energyLS Jun 12, 2024
4a7d51d
Merge pull request #334 from pypsa-meets-earth/Params_build_cop_profiles
energyLS Jun 12, 2024
44716a8
Merge pull request #335 from pypsa-meets-earth/Params_build_heat_demand
energyLS Jun 12, 2024
14a8088
Merge pull request #336 from pypsa-meets-earth/Params_build_industria…
energyLS Jun 12, 2024
1f53c0b
Merge pull request #337 from pypsa-meets-earth/Params_build_industry_…
energyLS Jun 12, 2024
b6b8496
Merge pull request #339 from pypsa-meets-earth/Params_build_ship_profile
energyLS Jun 12, 2024
b5d8f06
Merge pull request #340 from pypsa-meets-earth/Params_build_solar_the…
energyLS Jun 12, 2024
b5d93b7
Merge pull request #341 from pypsa-meets-earth/Params_build_temperatu…
energyLS Jun 12, 2024
44b1dff
Merge pull request #342 from pypsa-meets-earth/Params_copy_config
energyLS Jun 12, 2024
bef8f2b
Update Snakefile
Eddy-JV Jun 12, 2024
0dc4777
Merge pull request #343 from pypsa-meets-earth/Params_make_summary
energyLS Jun 12, 2024
0111c31
Update add_export.py
Eddy-JV Jun 12, 2024
08470fc
Merge pull request #331 from pypsa-meets-earth/Params_add_export
Eddy-JV Jun 12, 2024
0f9efb7
Merge pull request #345 from pypsa-meets-earth/Params_prepare_airports
energyLS Jun 12, 2024
a829979
Merge pull request #346 from pypsa-meets-earth/Params_prepare_gas_net…
energyLS Jun 12, 2024
ed9c88c
Merge pull request #347 from pypsa-meets-earth/Params_ports_and_urban…
energyLS Jun 12, 2024
be1d16e
Merge pull request #344 from pypsa-meets-earth/Params_override_respot
energyLS Jun 12, 2024
6553b39
Add Params to build_population_layout
Eddy-JV Jun 12, 2024
55e5559
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 12, 2024
3cb090b
Merge pull request #348 from pypsa-meets-earth/Params_ports_and_urban…
energyLS Jun 13, 2024
e870f90
enhance the industry scripts and adapt the fuel aggregation
hazemakhalek Jun 18, 2024
d410171
Merge branch 'main' into adaptations_to_industry_demand
hazemakhalek Jun 18, 2024
f504501
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 18, 2024
0bae1d7
Merge branch 'main' into 323-missingoutputexception-in-rule-prepare_g…
doneachh Jun 22, 2024
b734732
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 22, 2024
51ec971
remove legacy EUR code
hazemakhalek Jun 24, 2024
16bd459
remove legacy params form config
hazemakhalek Jun 24, 2024
9f95f3a
remove legacy params form config
hazemakhalek Jun 24, 2024
3944831
Update build_base_industry_totals.py
hazemakhalek Jun 24, 2024
2a965ad
Update build_base_energy_totals.py
hazemakhalek Jun 24, 2024
34c5bc6
Merge branch 'main' into Params_build_population_layouts
Eddy-JV Jun 27, 2024
cf5b125
Merge branch 'pypsa-meets-earth:main' into pandas_deprecations
finozzifa Jul 2, 2024
880688b
omit double transpose
finozzifa Jul 2, 2024
704a0b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
c3f103a
remove plotting from workflow
doneachh Jul 2, 2024
5c29105
remove plotting from prepare_gas_network
doneachh Jul 2, 2024
dc4f4a2
Test routine: add Makefile
FabianHofmann Jul 3, 2024
51ee32b
CI: bump cache number, remove os prefixes and labels
FabianHofmann Jul 3, 2024
e0840f5
Makefile: add tutorial yaml as additional config
FabianHofmann Jul 3, 2024
ed3f065
snakefile: use config.default as basis
FabianHofmann Jul 3, 2024
520b9de
snakefile: fix databundle config path
FabianHofmann Jul 3, 2024
8ffe017
debug: print out downloaded files
FabianHofmann Jul 3, 2024
4dd730c
snakefile: use renewables as bases for used cutouts
FabianHofmann Jul 3, 2024
ec4c8ed
Merge pull request #338 from pypsa-meets-earth/Params_build_populatio…
Eddy-JV Jul 3, 2024
5d32745
Include scenario management
davide-f Jul 3, 2024
e0647e0
Merge remote-tracking branch 'origin/main' into scenario_setup
davide-f Jul 3, 2024
a158482
Add scenario in tutorial
davide-f Jul 3, 2024
9f943e4
Merge pull request #350 from pypsa-meets-earth/repo_cleaning
davide-f Jul 3, 2024
b43f82c
Update submodule
davide-f Jul 3, 2024
ffdf44e
Add shared_cutouts
davide-f Jul 3, 2024
58f2fb7
Fix missing RDIR_PE
davide-f Jul 4, 2024
40677a3
merge from main
finozzifa Jul 4, 2024
88005e7
Merge branch 'pandas_deprecations' of https://github.com/finozzifa/py…
finozzifa Jul 4, 2024
3fb0747
Merge pull request #324 from pypsa-meets-earth/323-missingoutputexcep…
energyLS Jul 4, 2024
2b643f4
fix IndexError (#326)
doneachh Jul 4, 2024
dde594b
solve_network: modularize solver_options to allow for incremental con…
FabianHofmann Jul 8, 2024
686f4d5
refactor configs: boil down to effective diff in tutorial yaml and sc…
FabianHofmann Jul 8, 2024
550a511
test: remove config no_progress
FabianHofmann Jul 8, 2024
7698e4b
ci: disable for windows
FabianHofmann Jul 8, 2024
22cddc2
helpers: use copy_default_files
FabianHofmann Jul 8, 2024
3675d3f
Merge branch 'pypsa-meets-earth:main' into pandas_deprecations
finozzifa Jul 8, 2024
19839d4
config: make config.default + config.tutorial match old config.tutorial
FabianHofmann Jul 8, 2024
83a6fbe
solve_network: fix options assignment in prepare
FabianHofmann Jul 9, 2024
f1fdcee
add build_heating_distribution
davide-f Jul 10, 2024
bd9a303
Update licensing
davide-f Jul 10, 2024
5c19e94
Set location to Earth
davide-f Jul 10, 2024
ad2f5ad
Merge remote-tracking branch 'origin/main' into multiyear
davide-f Jul 11, 2024
2f1feaf
Update cluster pop
davide-f Jul 11, 2024
39609ca
Fix typos
davide-f Jul 11, 2024
49abe0d
Bugfix to skip h2 pipelines with missing buses
davide-f Jul 11, 2024
3db1f23
Bugfix h2_network loc
davide-f Jul 11, 2024
59737b4
reintroduce config.tutorial.yaml as basis (possibly revert this commi…
FabianHofmann Jul 11, 2024
9ce5d2b
doc: update testing documentation [skip ci]
FabianHofmann Jul 12, 2024
cc3194c
Merge branch 'main' into refactor-test-and-ci
FabianHofmann Jul 12, 2024
24ae2b4
Merge branch 'main' into refactor-test-and-ci
FabianHofmann Jul 12, 2024
865cadf
add comments to makefile
FabianHofmann Jul 12, 2024
aaa8923
Update myopic test
davide-f Jul 12, 2024
a4eed34
Bugfix none location in build_industrial_database
davide-f Jul 13, 2024
fe35ac1
Revise run_test myopic name
davide-f Jul 13, 2024
f585dcc
Merge pull request #318 from pypsa-meets-earth/multiyear
energyLS Jul 15, 2024
43572fd
Merge branch 'main' of https://github.com/finozzifa/pypsa-earth-sec i…
finozzifa Jul 16, 2024
dffe41b
revert transpose
finozzifa Jul 16, 2024
99e8e00
delete plot_network_eur.py
finozzifa Jul 16, 2024
9c3ec89
Merge pull request #353 from finozzifa/pandas_deprecations
davide-f Jul 16, 2024
0a61aa6
Merge branch 'main' into scenario_setup
davide-f Jul 16, 2024
e9cd429
minor bug in build_base_energy_totals
hazemakhalek Jul 17, 2024
a690b66
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 17, 2024
c812db1
Update build_base_industry_totals.py
hazemakhalek Jul 17, 2024
3233fa7
adapt build_base_energy and build_base_industry to params
hazemakhalek Jul 17, 2024
3219a68
add missing param in snakefile
hazemakhalek Jul 17, 2024
eaacba4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 17, 2024
e9b7f64
Revise myopic test file
davide-f Jul 17, 2024
ab04ea8
fix param in snakefile
hazemakhalek Jul 17, 2024
cfb9d7b
Merge branch 'main' into adaptations_to_industry_demand
hazemakhalek Jul 17, 2024
2a7972e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 17, 2024
92b3c19
reset config.pypsa-earth.yaml
hazemakhalek Jul 17, 2024
68e8888
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 17, 2024
698bda7
Update Snakefile
hazemakhalek Jul 17, 2024
da82c5e
handle exception to avoid reference before assignment error
hazemakhalek Jul 17, 2024
d994d10
Add different scenario name for subworkflow
davide-f Jul 18, 2024
299c0ee
Fix myopic test
davide-f Jul 18, 2024
18a5cd7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 18, 2024
b0cee2a
Update config.test_myopic.yaml to include new parameter
hazemakhalek Jul 18, 2024
031ad55
replace snakemake subworkflow by submodule; fix path relations
FabianHofmann Jul 18, 2024
7f88c62
Merge pull request #356 from pypsa-meets-earth/scenario_setup
davide-f Jul 18, 2024
efffd11
fill NaN without international bunkers
cpschau Jul 18, 2024
7c293d2
remove factor for gas emissions from residential and services sector
cpschau Jul 18, 2024
a8cbb02
account for multi-country-cases
cpschau Jul 18, 2024
a84abcf
Merge pull request #359 from cpschau/fix_emission_bug
hazemakhalek Jul 18, 2024
443cd35
snakefile: replace rdir by resdir for compatibility with pypsa-earth
FabianHofmann Jul 19, 2024
920d1fe
Merge branch 'main' into snakemake-module
FabianHofmann Jul 19, 2024
e847f45
Update build_base_industry_totals.py
hazemakhalek Jul 19, 2024
230e173
Update Snakefile
hazemakhalek Jul 19, 2024
d73648f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 19, 2024
5f1cac9
Update build_base_industry_totals.py
hazemakhalek Jul 19, 2024
b7da641
Merge pull request #317 from pypsa-meets-earth/adaptations_to_industr…
davide-f Jul 19, 2024
82fe4df
modified config to fix nan objective value
GbotemiB Jul 20, 2024
cf3db59
print objective value to terminal
GbotemiB Jul 22, 2024
c8265ba
Merge pull request #360 from GbotemiB/test-fix
hazemakhalek Jul 22, 2024
f324f42
fix for urls not working
GbotemiB Jul 30, 2024
e1563c9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 30, 2024
d178a15
Merge pull request #362 from GbotemiB/refactor-transport-input
hazemakhalek Jul 31, 2024
4125c21
added license for datasets
GbotemiB Jul 31, 2024
4a4f1ff
Update README.md
hazemakhalek Jul 31, 2024
0c90539
Update README.md
hazemakhalek Jul 31, 2024
d6bdaac
Merge pull request #363 from GbotemiB/update-readme-license
hazemakhalek Jul 31, 2024
61252aa
Final README adaptations before v0.2 release (#364)
hazemakhalek Aug 1, 2024
9b1d582
updated pypsa-earth submodule to v0.4.0
GbotemiB Aug 5, 2024
1bcf1e5
Merge pull request #365 from GbotemiB/update-submodule
hazemakhalek Aug 5, 2024
7b55745
adjust modular solver options
FabianHofmann Aug 8, 2024
52d77d0
resolve global paths
FabianHofmann Aug 8, 2024
6981720
workflow: use global root directory to avoid recursive upwards chdir
FabianHofmann Aug 8, 2024
f55c84b
update pypsa-earth commit
FabianHofmann Aug 8, 2024
8573dd5
Merge branch 'main' into snakemake-module
FabianHofmann Aug 8, 2024
e2778b3
Merge branch 'main' into subworkmodule-preparation
FabianHofmann Aug 8, 2024
23bc59f
revert changes to config.default and config.tutorial priority
FabianHofmann Aug 8, 2024
779482d
udpate pypsa-earth
FabianHofmann Aug 8, 2024
329a4f9
consolidate CI yaml
FabianHofmann Aug 8, 2024
15a5c95
yamllint: align formatting and config
FabianHofmann Aug 8, 2024
614e690
Snakefile: fix SDIR and RESDIR path ending
FabianHofmann Aug 9, 2024
58a620d
ci.yaml include git submodule
FabianHofmann Aug 9, 2024
9de87d6
fix duplicated "/"
FabianHofmann Aug 9, 2024
1219130
remove config.pypsa-earth.yaml in favour of actual pypsa-earth defaul…
FabianHofmann Aug 9, 2024
6c241ae
remove pypsa-earth.config from copy_config
FabianHofmann Aug 12, 2024
f229301
ci: use one core to better track log
FabianHofmann Aug 12, 2024
94ba370
test: use more core
FabianHofmann Aug 13, 2024
858455e
make yamllint compatible
FabianHofmann Aug 13, 2024
d8c6351
build_renewable_profiles: use local client in order to suppress verbo…
FabianHofmann Aug 13, 2024
ef54888
update submodule
FabianHofmann Aug 13, 2024
1480d7a
Merge remote-tracking branch 'pypsa-earth-sec/snakemake-module' into …
FabianHofmann Aug 16, 2024
739f2d3
config: consolidate clustering key
FabianHofmann Aug 16, 2024
a65e9dc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 16, 2024
7aded83
solve_networks: fix network reference for sector coupled case
FabianHofmann Aug 28, 2024
96b1dfc
address review comments
FabianHofmann Aug 30, 2024
2aaaca8
config.myopic.yaml: revert country order again
FabianHofmann Aug 30, 2024
96f1b98
Update README.md
FabianHofmann Sep 5, 2024
c4be782
address davides comments (first round)
FabianHofmann Sep 5, 2024
c2f7b26
consolidate current working directory; considate helpers scripts
FabianHofmann Sep 5, 2024
a447d05
fix reference to helpers script; fix fiona version
FabianHofmann Sep 5, 2024
876c116
env: update ppm version
FabianHofmann Sep 5, 2024
5c12e34
build_industrial_database: make retrieval robust against restrictive …
FabianHofmann Sep 5, 2024
a131bd0
follow up: consolidate restrictive url retrievals
FabianHofmann Sep 5, 2024
6c89da1
helpers: reinsert gadm functions from pypsa-earth-sec due to discrepa…
FabianHofmann Sep 5, 2024
3b3d442
env: temporarily install new earth osm version from pypi
FabianHofmann Sep 5, 2024
c576936
ci: restrict ipopt for windows
FabianHofmann Sep 5, 2024
36dea59
env: follow up
FabianHofmann Sep 5, 2024
94a7bc6
ci: roll back and disable windows
FabianHofmann Sep 5, 2024
2dea157
_helpers: try make content_retrieval more robust
FabianHofmann Sep 5, 2024
c257ebc
Update README.md
FabianHofmann Sep 11, 2024
11f2a75
config: bump version; add `allow_scenario_failure` flag; remove `base…
FabianHofmann Sep 12, 2024
98a7716
Snakefile: make cutout path consistent for sector-coupled version
FabianHofmann Sep 12, 2024
c93821d
helpers: fix numpy random usage
FabianHofmann Sep 12, 2024
66d6ca4
properly remove submodule
FabianHofmann Sep 16, 2024
5d458dd
add version tag to all configs
FabianHofmann Sep 16, 2024
dfaf9fd
env: update powerplantmatching
FabianHofmann Sep 16, 2024
3d56e79
add missing config version tag
FabianHofmann Sep 16, 2024
4ca2f9f
Merge branch 'main' into merge-pyspa-earth-sec
FabianHofmann Sep 16, 2024
9826175
Merge remote-tracking branch 'upstream/main' into merge-pyspa-earth-sec
FabianHofmann Sep 16, 2024
5fe4587
update powerplantmatching
FabianHofmann Sep 16, 2024
ea9a488
follow up: move ppm installation to pip while conda is not out
FabianHofmann Sep 16, 2024
6959bad
readme: add description on running previous models
FabianHofmann Sep 17, 2024
c010991
helpers: add HTTPError as allowed exception
FabianHofmann Sep 17, 2024
5361925
Merge branch 'main' into merge-pyspa-earth-sec
FabianHofmann Sep 19, 2024
a6ce5b4
config: remove lifetime from config.default
FabianHofmann Sep 19, 2024
619a789
harmonize cost calculation in sector coupled model
FabianHofmann Sep 19, 2024
d8a36d3
bump version tag in readme [skip ci]
FabianHofmann Sep 19, 2024
4eb9f82
Merge remote-tracking branch 'upstream/main' into merge-pyspa-earth-sec
FabianHofmann Sep 19, 2024
f5e7317
update README to account for Hazem's comments
ekatef Sep 19, 2024
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
90 changes: 0 additions & 90 deletions .github/workflows/ci-linux.yaml

This file was deleted.

76 changes: 0 additions & 76 deletions .github/workflows/ci-mac.yaml

This file was deleted.

76 changes: 0 additions & 76 deletions .github/workflows/ci-windows.yaml

This file was deleted.

72 changes: 72 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: CI

on:
push:
branches:
- main
pull_request:
branches:
- main
schedule:
- cron: "0 5 * * TUE"

env:
CACHE_NUMBER: 2 # Change this value to manually reset the environment cache

jobs:
build:
strategy:
fail-fast: false
max-parallel: 3
matrix:
os:
- ubuntu-latest
- macos-latest
# - windows-latest
FabianHofmann marked this conversation as resolved.
Show resolved Hide resolved

runs-on: ${{ matrix.os }}

defaults:
run:
shell: bash -l {0}

steps:
- uses: actions/checkout@v2


- name: Setup micromamba
uses: mamba-org/setup-micromamba@v1
with:
micromamba-version: latest
environment-file: envs/environment.yaml
log-level: debug
init-shell: bash
cache-environment: true
cache-downloads: true


- name: Set cache dates
run: |
echo "WEEK=$(date +'%Y%U')" >> $GITHUB_ENV

- name: Cache data and cutouts folders
uses: actions/cache@v3
with:
path: |
data
cutouts
key: data-cutouts-${{ env.WEEK }}-${{ env.CACHE_NUMBER }}


- name: Conda list
run: conda list

- name: Run Test
run: make test

# - name: Test plotting and summaries
# run: |
# snakemake --cores all plot_all_p_nom
# snakemake --cores all plot_all_summaries
# snakemake --cores all make_all_summaries
# rm -rf resources/*.nc resources/*.geojson resources/*.h5 networks results
Loading
Loading