Merge upstream pypsa-eur onto pypsa-wal (2025-10-20)#14
Merged
measrainsey merged 17 commits intomasterfrom Oct 20, 2025
Merged
Conversation
* Fix retrieve_eurostat_data for Windows Bugfix: - close the temporary file in retrieve_eurostat_data and retrieve_eurostat_household_data before accessing it again to unzip it * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update the release_notes --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <[email protected]> Co-authored-by: Lukas Trippe <[email protected]>
* Add oetc configuration support Co-authored-by: Fabian Hofmann <[email protected]> --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Fabian Hofmann <[email protected]>
Co-authored-by: lkstrp <[email protected]>
* remove pinned environment reference from pre-commit-config * release notes
Conflicts: doc/release_notes.rst envs/win-64.lock.yaml
Merge changes from upstream
* Update the other pre-commit tasks * Revert pre-commit versions
* doc: clean headers * doc: improve PR template * Apply suggestions from code review Co-authored-by: Johannes HAMPP <[email protected]> * refactor: adjust header for new page * fix: adjust header for OETC --------- Co-authored-by: Johannes HAMPP <[email protected]>
Conflicts: doc/release_notes.rst
Merge changes from upstream
measrainsey
changed the title
pypsa-eur: 2025-10-20pypsa-eur onto pypsa-wal (2025-10-20)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR to bring in upstream changes from
oet/pypsa-eurThis was already done in #12. However, afterwards PR #13 was merged onto
masterand the branch for PR #13 didn't have the latest upstream changes merged onto there, so I thought thepypsa-walmasterbranch became out of sync again.This PR didn't seem to have fixed the issue of the
masterbranch being out-of-sync with upstream.Changes proposed in this Pull Request
Checklist
envs/environment.yaml.config/config.default.yaml.doc/configtables/*.csv.doc/data_sources.rst.doc/release_notes.rstis added.