Skip to content

Merge changes from upstream - #44

Merged
tgilon merged 16 commits into
masterfrom
merge-upstream-15-07
Jul 21, 2025
Merged

Merge changes from upstream#44
tgilon merged 16 commits into
masterfrom
merge-upstream-15-07

Conversation

@tgilon

@tgilon tgilon commented Jul 15, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Closes # (if applicable).

Changes proposed in this Pull Request

This PR brings in upstream changes. Two minor conflicts in config/config.default.yaml and .reuse/dep5.

This PR already incorporates the fix suggested in PyPSA#1757 (raised for this PR).

Checklist

  • I tested my contribution locally and it works as intended.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
  • Changes in configuration options are added in config/config.default.yaml.
  • Changes in configuration options are documented in doc/configtables/*.csv.
  • OET license identifier is added to all edited or newly created code files.
  • Sources of newly added data are documented in doc/data_sources.rst.
  • A release note doc/release_notes.rst is added.

github-actions Bot and others added 16 commits July 7, 2025 14:27
@github-actions @lkstrp
fix(deps): pin xarray<2025.07.0 (PyPSA#1736)
56eb5d8 
* Update locked environment files for all platforms

* fix(deps): pin `xarray<2025.07.0`

* Revert "Update locked environment files for all platforms"

This reverts commit 9bcdd41.

---------

Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
Co-authored-by: lkstrp <lkstrp@pm.me>
@github-actions @lkstrp
Update locked environment files for all platforms (PyPSA#1738)
72a962a 
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
@lkstrp
fix: PyPSA v1 compatibility follow up (PyPSA#1741)
ed670ac
@euronion
Chore: Replace dep5 file with REUSE.toml (PyPSA#1739)
b1419e6 
* chore: Replace deprecated dep5

* code: Move licence identifier into appropriate file

* Update release_notes.rst
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (PyPSA#1744)
c8ce51e 
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.11.8 → v0.12.2](astral-sh/ruff-pre-commit@v0.11.8...v0.12.2)
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.14.0 → v2.15.0](macisamuele/language-formatters-pre-commit-hooks@v2.14.0...v2.15.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@bobbyxng @pre-commit-ci
Bug fix for non-linestrings (PyPSA#1737)
fe6b51b 
* Bug fix for MultiLineStrings

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Reverted to absolute paths

* Reverted to absolute paths

* Fix absolute import path

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@tgilon
fix: fix rulegraph for snakemake 9.7.1 (PyPSA#1745)
f4388f9 
* feat: make config.yaml optional

* feat: make rulegraph compatible with snakemake 9.7.1

* doc: add release note
@TomKae00 @amos-schledorn
fix: pass heat_pump_cop_approximation configs correctly (PyPSA#1729)
b1a5e9d 
* fix: forward heat_pump_cop_approximation config to CentralHeatingCopApproximator

* refactor: set correct heat source for ptes boosting and include titel/link to source for min_delta_t_lift

---------

Co-authored-by: Amos Schledorn <60692940+amos-schledorn@users.noreply.github.com>
@JuliaSvn
Fix plot_hydrogen_network : storage + Added CCL explantions in th…
7c5e6fe 
…e configtables (PyPSA#1727)

* Add offwind float to CCL

* Update plot_hydrogen_network.py

Fix the code to plot the storage

* Update release_notes.rst

* Update solving.csv

Add precision for the CCL constraint (not working with a time resolution higher than 1h) + add indication on how to use agg_p_nom_limits
@cpschau
fix: update function to check against instead of (PyPSA#1750)
aea4d7b
@cpschau cpschau @fneum
Allow country-specific district heating potentials (PyPSA#1742)
06cc0ad 
* allow country-specific district heating potentials

* fix: handle missing district heating potential for countries

* docs: add comments to enhance comprehensibility

---------

Co-authored-by: cpschau <caspar.schauss@ieg.fraunhofer.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
@fneum @pre-commit-ci
prepare release v2025.07.0 (PyPSA#1753)
e43746d 
* prepare release v2025.07.0

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* simplify CI tests

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@tgilon @FabianHofmann
@pre-commit-ci @fneum @daniel-rdt @bobbyxng
feat: add a TYNDP base network (PyPSA#1646)
6f9475f 
* feat: enable bidding zone download and cluster by busshapes

* first draft of mapping nuts3 to bidding zones

* include bidding zone as administrative level

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refac: remove unneeded functions

* feat: apply review suggestions

Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: allow to skip detached islands without substation in base_network
fix: return type in build_bidding_zones

* fix: correct typo for UKNI

* test: improve test configuration file

* Add across_borders option to remove_stubs

* doc: describe retrieve_bidding_zones.py and build_bidding_zones.py and add release note

* Apply suggestions from code review

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

* feat: fix raw shapefiles version for reproducibility

* code: make bidding_zones an optional argument in sm rules and improve retrieve rule

* feat: add an option to optionally exclude some islands and merge bidding zones to tyndp level

* feat: define UKNI and IE as a single bidding zone

* feat: add a function to snap borders when replacing a country

* doc: improve readibility of the code

* feat: remove holes in shapes file

* fix: disable reassign if no bidding zones

* refactor: refactor the cluster name in busmap_from_shapes

* feat: generalize copperplate_regions option

* ci: fix wildcard error in retrieve_bidding_zones

* doc: improve release note

* Include electricity reference grid (#18)

* Introduce build_tyndp_network

* Improve compatibility with base_network

* Fix scenario behaviour

* Add basic mapping for Luxemburg

* Handle exceptions for corsica, northern ireland and crete

* Add rule in makefile

* Fix typo

* Improve shape file for Norway and Luxembourg

* Fix join to keep added regions from shape

* Add plot_base_network

* Improve documentation of plot_base_network

* Assume some nodes to be co-located in the reference grid

* Add Malta

* Improve makefile

* Improve H2 buses location

* Improve H2 buses location

* Add virtual nodes in Italy

* Harmonize configuration

* Add arguments to makefile

* Warn before dropping links connected to unknown buses

* Remove Kosovo from the country list

* Generalize naming convention in base_network

* Fix type issue with empty dataframe in base_network

* Harmonize configuration

* Disable transmission projects

* Ignore CY and MT in synthetic demand data

* Skip cluster network with TYNDP base network

* Skip load upsampling for missing countries

* Refine assumptions for ITCO and ITVI

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update configuration file to use administrative clustering

* Update makefile to use the new dag rules

* ci: fix ci configuration and tests

* feat: make build tyndp compatible with the new shape file

* test: remove plotting from the test

* feat: bring in bidding zones constructor from upstream pr

* code: improve configuration set

* doc: add a release note

* test: improve cleaning rule for tests

* chore: use tyndp-raw as first

* ci: refactor function names and remove unused column for unit tests

* ci: try to solve online tests

* Revert "ci: try to solve online tests"

This reverts commit 8871381.

* code: add logging to the retrieve_bidding_zones rule

* ci: fix environment names to pass ci

* code: remove scenarios to simplify configurations

* Retrieve data from TYNDP bundle (#15)

* add retrieve rule and script to retrieve TYNDP data bundle from Zenodo

* Improve doc string

* Add data retrieve as default for tyndp

* Shorten folder name

---------

Co-authored-by: daniel-rdt <daniel.ruedt@openenergytransition.org>
(cherry picked from commit 5e87916)

* Fix data bundle URL

(cherry picked from commit d956d17)

* code: fix configuration for reference grid

* code: improve snakemake configuration for retrieve_tyndp_bundle

* code: revert converter dc boolean

* Apply suggestions from code review

Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com>

* doc: add to do in scripts/build_tyndp_network.py

Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com>
# Conflicts:
#	Makefile
#	doc/release_notes.rst
#	rules/build_electricity.smk
#	scripts/build_bidding_zones.py
#	scripts/cluster_network.py
#	scripts/retrieve_bidding_zones.py

* chore: clean the cherry pick from open-tyndp

* feat: create default behaviour for tyndp-raw

* feat: enable more granular set of countries

* ci: improve ci test

* doc: fix merge issue with release note

* doc: improve release note

* doc: add new rules to documentation

* ci: improve test configuration

* doc: add new rules to documentation

* refactor: use logger consistently

* ci: update config file to use default cutout and disable shared resources

* ci: fix path for tyndp test file

* refactor: switch to original data source for reference grid data

* test: use rule name in test

* fix: correct if clause to avoid DC lossy_lossy_bidirectional_links

* doc: improve verbositiy of logger

* refactor: switch base network name from tyndp-raw to tyndp

* feat: ignore errors when retrieving data bundle

* feat: remove unnecessary clustering limitation

* Apply suggestions from code review

* doc: add tyndp 2024 in data sources

---------

Co-authored-by: Fabian <fab.hof@gmx.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com>
Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
@bobbyxng
fix: logger.getLogger("gurobipy") does not exist (PyPSA#1755)
67f0919
@tgilon
Merge branch 'master-upstream' into merge-upstream-15-07
454e3eb 
 Conflicts:
	.reuse/dep5
	config/config.default.yaml
@tgilon
fix: fix country_converter logging in build_population_layouts
8e8ec2c
@tgilon
tgilon marked this pull request as ready for review July 15, 2025 09:01
@tgilon
tgilon requested a review from daniel-rdt July 15, 2025 09:02
@tgilon

tgilon commented Jul 15, 2025

Copy link
Copy Markdown
Member Author

FYI @coroa

daniel-rdt
daniel-rdt approved these changes Jul 18, 2025
View reviewed changes
Comment thread config/config.default.yaml
@tgilon
tgilon merged commit 31b54bc into master Jul 21, 2025
5 checks passed
@tgilon
tgilon deleted the merge-upstream-15-07 branch July 21, 2025 09:11
yerbol-akhmetov pushed a commit to open-energy-transition/gb-dispatch-model that referenced this pull request Feb 12, 2026
@brynpickering
Merge pull request open-energy-transition#44 from open-energy-transit…
aa44f92 
…ion/merge-upstream-2026-01-27

Merge upstream 2026 01 27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daniel-rdt daniel-rdt daniel-rdt approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@tgilon @daniel-rdt @lkstrp @euronion @bobbyxng @TomKae00 @JuliaSvn @cpschau @fneum