Skip to content

Merge upstream 26 01 30#152

Open
lindnemi wants to merge 43 commits intomainfrom
merge-upstream-26-01-30
Open

Merge upstream 26 01 30#152
lindnemi wants to merge 43 commits intomainfrom
merge-upstream-26-01-30

Conversation

@lindnemi
Copy link
Collaborator

Before asking for a review for this PR make sure to complete the following checklist:

  • Workflow with target rule ariadne_all completes without errors
  • The logic of export_ariadne_variables has been adapted to the changes
  • One or several figures that validate the changes in the PR have been posted as a comment
  • A brief description of the changes has been added to Changelog.md
  • The latest main has been merged into the PR
  • The config has a new prefix of the format YYYYMMDDdescriptive_title

coroa and others added 30 commits January 6, 2026 10:00
* fix: compatibility of build_gas_* rules with pyogrio >=0.12.0

pyogrio >=0.12.0 returns JSON fields directly as dicts/lists, so that loading them again
as json fails.

refer to https://github.com/geopandas/pyogrio/releases/tag/v0.12.0 .

* Update release_notes.rst
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.13.3 → v0.14.10](astral-sh/ruff-pre-commit@v0.13.3...v0.14.10)
- [github.com/fsfe/reuse-tool: v6.0.0 → v6.2.0](fsfe/reuse-tool@v6.0.0...v6.2.0)

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

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

* fix: types

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <lkstrp@pm.me>
* code: Make path relative to current snakefile

* doc: Add release notes on data layer
* Update locked environment files for all platforms

* trigger

---------

Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
Co-authored-by: lkstrp <lkstrp@pm.me>
* Fix Bug 1: Resolve double prefixing caused by f-string coercion.

* Fix Bug 2: Rule retrieve_co2stop not saving files in correct location.
Fix by making filepaths relative to an input or output location.

* Fix Bug 3: make filepaths in rule retrieve_corine relative to the zip_file in `input`

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

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

* Updated release notes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* minimal version

* new `config.default.yaml`

* exclude schema from pre-commit

* add model for default config

* add `schema.json`

* ci: add schema in sync check

* duck type model schema

* show schema in docs

* move ci check to unit test

* updade lock file and add data.py schema

* update schema

* fix pre-commit, split workflow

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

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

* shorten workflow name

* fix undocumented literals

* merge changes from #1940

* fix docs

* feat: add relative schema definition to config files

* feat: add relative schema definition to config/examples files

Maybe we don't want that, since those would be moved to config/... when being used and
then the link would be broken?

* feat: Use ruamel to add comments back into the config.default.yaml

* fix: readd newlines between top-level sections

* fix(doc): fix broken references

* feat: convert pydantic description links to rst

* feat: add markdownDescription attributes for schema links

* fix literal-includes in docs

* add contributing docs, switch yaml with description in config docs

* remove typing_extension, fix more links

* update schema

* apply review

* docs: add custom validators info (field and model)

* docs: fix links

* update lock file

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jonas Hoersch <jonas.hoersch@openenergytransition.org>
* Fix europe-2013 cutout default value.

* Updated default config and schema to revert to 2013 cutout.

---------

Co-authored-by: Lukas Trippe <lkstrp@pm.me>
* Add messages for all retrieval rules

* Add messages for all build electricity rules

* Add messages to sector building rules

* Add messages for collect rules

* Add messages for solve electricity rules

* Add messages for solve myopic rules

* Add messages for solve overnight rules

* Add messages for solving perfect foresight rules

* Added messages to postprocessing rules

* Add missing qualifiers to messages

* Add missing qualifiers to build elec messages

* Add release note

* Fixed typo in message

* Removed missing wildcard from the message

* Add rule name to message (if not present) for logging

* Fix incorrect wildcard in rule

* feat: Add simple descriptive logger plugin and use by default

The logger plugin registers a derived class of snakemake's DefaultFormatter
which shows the bold message in front of the regular job info block.

* Revert "Add rule name to message (if not present) for logging"

This reverts commit c4fd02e72e4d6a7a0b8a8b25eda3ce96049098dc.

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

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

* Add SPDX license metadata to plugin

* Do not track Python eggs

* Rename plugin from descriptive to pypsa

* Add SPDX license metadata to config

* Update plugins/snakemake-logger-plugin-pypsa/README.md

Co-authored-by: Lukas Trippe <lkstrp@pm.me>

* add profiles docummentation

Co-authored-by: Lukas Trippe <lkstrp@pm.me>

* fix: formatting

* Moved plugin code to own repository

* Add pixi.toml from master branch

* Add logger plugin to pixi toml

* Added messages to each of the retrieve rules

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

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

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

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

* update lock file

---------

Co-authored-by: Jonas Hoersch <jonas.hoersch@openenergytransition.org>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <lkstrp@pm.me>
Co-authored-by: Jonas Hörsch <coroa@posteo.de>
* fix: avoid netcdf4 version 1.7.4

* Revert "fix: avoid netcdf4 version 1.7.4"

This reverts commit 23fb6ad41234c126e3024cff5e2a958923f060b5.

* pin in `pixi.toml`

---------

Co-authored-by: lkstrp <lkstrp@pm.me>
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
* Updated technology-data to v0.13.4.

* Added release note.

* Update data/versions.csv

* Update data/versions.csv

Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>

---------

Co-authored-by: Lukas Trippe <lkstrp@pm.me>
Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
* Fix mock snakemake for Snakemake API changes.

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

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

* Updated pixi.lock.

* Added release notes.

* Make mock_snakemake more robust: Handling different LoggerManager arguments depending on snakemake version.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <lkstrp@pm.me>
* Ensure gas bus exists without CCGT:gas option

* Add catch for if biomass not activated with industry.

* Update release notes

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
* Fix bug of no gas infrastructure when no CCGT: gas implemented.

* Add release notes.
* use custom domain and keep zenodo under source "archive"

* change versions.csv formatting

* changes to `versions.csv` and add schema

* update lock file

* apply review

* update lock file

* remove zenodo source again

* more sorting, add missing primarys to archive, use safe version for url slug

* fix and enforce correct setting of latest tag

* fix: cutouts store

* even stricter versions csv schema

* resolve conflict

* fix: ci cache, cutout-> cutouts, nitrogen latest tag

* fix: update schema

* add seawater nc to archive and versions.csv

* fix url

* review

* restore cutout revert

* add docs

* more review

* missed cutouts

* update schema
* update linopy pin

* udpate lock file
* feat: remove and disallow setting credentials in config

* Apply suggestions from code review

Co-authored-by: Jonas Hörsch <coroa@posteo.de>

* docs: add release note

* Apply suggestions from code review

Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>

* prevent secrets from being set

* apply review

* update lock file

* fix: just update pin, not full toml

* fix: another one

---------

Co-authored-by: Jonas Hörsch <coroa@posteo.de>
Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
…or (#1965)

* fix: update costs for solar-hsat in myopic optimization; small refactor

* add release-note
brynpickering and others added 13 commits January 22, 2026 10:48
* Fix raw OSM build and release process

- delete column filtering when preparing release
- use invariant names for virtual buses

---

Co-authored-by: yerbol-akhmetov <yerbol.akhmetov.93@gmail.com>

* Update index naming method to be compatible with pypsa >=v1

* Define endpoints by first and last linestring point; do not repeat voltage in virtual bus_ids

* Spelling

* fix: fix compatibility with numpy >=2 (#1958)

* fix: Version controlled data layer (#1963)

* code: Make path relative to current snakefile

* doc: Add release notes on data layer

* [github-actions.ci] Update locked envs (#1953)

* Update locked environment files for all platforms

* trigger

---------

Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
Co-authored-by: lkstrp <lkstrp@pm.me>

* Bugfix pypsa eur as snakemake module (#1967)

* Fix Bug 1: Resolve double prefixing caused by f-string coercion.

* Fix Bug 2: Rule retrieve_co2stop not saving files in correct location.
Fix by making filepaths relative to an input or output location.

* Fix Bug 3: make filepaths in rule retrieve_corine relative to the zip_file in `input`

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

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

* Updated release notes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* doc: Correct section indent for data inventory (#1973)

* Config Validation with Pydantic (#1912)

* minimal version

* new `config.default.yaml`

* exclude schema from pre-commit

* add model for default config

* add `schema.json`

* ci: add schema in sync check

* duck type model schema

* show schema in docs

* move ci check to unit test

* updade lock file and add data.py schema

* update schema

* fix pre-commit, split workflow

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

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

* shorten workflow name

* fix undocumented literals

* merge changes from #1940

* fix docs

* feat: add relative schema definition to config files

* feat: add relative schema definition to config/examples files

Maybe we don't want that, since those would be moved to config/... when being used and
then the link would be broken?

* feat: Use ruamel to add comments back into the config.default.yaml

* fix: readd newlines between top-level sections

* fix(doc): fix broken references

* feat: convert pydantic description links to rst

* feat: add markdownDescription attributes for schema links

* fix literal-includes in docs

* add contributing docs, switch yaml with description in config docs

* remove typing_extension, fix more links

* update schema

* apply review

* docs: add custom validators info (field and model)

* docs: fix links

* update lock file

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jonas Hoersch <jonas.hoersch@openenergytransition.org>

* Update lock file workflow to remove push trigger (#1975)

* chore: fix formatting and improve consistency in data layer doc (#1977)

* follow up on #1977 (#1980)

* Fix atlite cutouts default value (#1979)

* Fix europe-2013 cutout default value.

* Updated default config and schema to revert to 2013 cutout.

---------

Co-authored-by: Lukas Trippe <lkstrp@pm.me>

* Revert "Update lock file workflow to remove push trigger (#1975)" (#1982)

This reverts commit cd00bb3.

* Add user friendly messages to snakemake workflow (#1846)

* Add messages for all retrieval rules

* Add messages for all build electricity rules

* Add messages to sector building rules

* Add messages for collect rules

* Add messages for solve electricity rules

* Add messages for solve myopic rules

* Add messages for solve overnight rules

* Add messages for solving perfect foresight rules

* Added messages to postprocessing rules

* Add missing qualifiers to messages

* Add missing qualifiers to build elec messages

* Add release note

* Fixed typo in message

* Removed missing wildcard from the message

* Add rule name to message (if not present) for logging

* Fix incorrect wildcard in rule

* feat: Add simple descriptive logger plugin and use by default

The logger plugin registers a derived class of snakemake's DefaultFormatter
which shows the bold message in front of the regular job info block.

* Revert "Add rule name to message (if not present) for logging"

This reverts commit c4fd02e72e4d6a7a0b8a8b25eda3ce96049098dc.

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

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

* Add SPDX license metadata to plugin

* Do not track Python eggs

* Rename plugin from descriptive to pypsa

* Add SPDX license metadata to config

* Update plugins/snakemake-logger-plugin-pypsa/README.md

Co-authored-by: Lukas Trippe <lkstrp@pm.me>

* add profiles docummentation

Co-authored-by: Lukas Trippe <lkstrp@pm.me>

* fix: formatting

* Moved plugin code to own repository

* Add pixi.toml from master branch

* Add logger plugin to pixi toml

* Added messages to each of the retrieve rules

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

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

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

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

* update lock file

---------

Co-authored-by: Jonas Hoersch <jonas.hoersch@openenergytransition.org>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <lkstrp@pm.me>
Co-authored-by: Jonas Hörsch <coroa@posteo.de>

* process eurostat energy balances via API

* Revert "process eurostat energy balances via API"

This reverts commit a81e100.

* fix: avoid netcdf4 version 1.7.4 (#1988)

* fix: avoid netcdf4 version 1.7.4

* Revert "fix: avoid netcdf4 version 1.7.4"

This reverts commit 23fb6ad41234c126e3024cff5e2a958923f060b5.

* pin in `pixi.toml`

---------

Co-authored-by: lkstrp <lkstrp@pm.me>

* Update locked environment files for all platforms (#1983)

Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>

* Updated technology-data to v0.13.4. (#1985)

* Updated technology-data to v0.13.4.

* Added release note.

* Update data/versions.csv

* Update data/versions.csv

Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>

---------

Co-authored-by: Lukas Trippe <lkstrp@pm.me>
Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>

* Fix mock snakemake for Snakemake API changes. (#1984)

* Fix mock snakemake for Snakemake API changes.

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

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

* Updated pixi.lock.

* Added release notes.

* Make mock_snakemake more robust: Handling different LoggerManager arguments depending on snakemake version.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <lkstrp@pm.me>

* Post-merge fix

---------

Co-authored-by: yerbol-akhmetov <yerbol.akhmetov.93@gmail.com>
Co-authored-by: Jonas Hörsch <coroa@posteo.de>
Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
Co-authored-by: lkstrp <lkstrp@pm.me>
Co-authored-by: jonathan-peel <52451628+jonathan-peel@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jonas Hoersch <jonas.hoersch@openenergytransition.org>
Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>
Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
Co-authored-by: Will Usher <wusher@kth.se>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
…r (#1991)

* feat: add electricitymaps and entsoepy bidding zone geospatial data to data layer

* config: autogenerate config.default.yaml and schema.json

* doc: add release note

* feat: use copy2 and update urls to be version specific

* feat: improve logger and handle raise timeout and url errors

* fix: move new versions.csv entries to the correct alphabetical position

* add to archive

---------

Co-authored-by: lkstrp <lkstrp@pm.me>
* fix: remove slurm dependency from windows environments

pixi's platform selectors are documented in
https://pixi.prefix.dev/latest/reference/pixi_manifest/#the-target-table .

unix means any linux and osx.

* Update release_notes.rst

* fix: Add PR link to release notes
* fix: follow up on added bidding zones datasets

* better cache invalidation

* monthly cache invalidation for cutouts

* add zstd dep

* add zstd dep
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
* code: Fix logic for extracting bYYYY from filename

* doc: Add release notes

---------

Co-authored-by: Lukas Trippe <lkstrp@pm.me>
* Fix the WDPA links to function on Windows

Minor changes:
- replace the second : in the WDPA links with %3A

* add additional url fixes and schema check

---------

Co-authored-by: Lukas Trippe <lkstrp@pm.me>
…#2021)

Bumps the github-actions group with 1 update: [prefix-dev/setup-pixi](https://github.com/prefix-dev/setup-pixi).


Updates `prefix-dev/setup-pixi` from 0.9.3 to 0.9.4
- [Release notes](https://github.com/prefix-dev/setup-pixi/releases)
- [Commits](prefix-dev/setup-pixi@v0.9.3...v0.9.4)

---
updated-dependencies:
- dependency-name: prefix-dev/setup-pixi
  dependency-version: 0.9.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix snakemake message.

* Added release notes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.