Skip to content

Merge october 13 #128

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open

Merge october 13 #128

wants to merge 34 commits into from

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

github-actions bot and others added 30 commits August 1, 2025 11:53
@github-actions @lkstrp
Update locked environment files for all platforms (#1758)
1374586 
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
@fneum
update snakemake readme (#1788)
8e45663
@lkstrp
fix: snakemake warnings (#1785)
9eeb87b
@bobbyxng
Increase rule memory (#1794)
d7aab7c
@lindnemi
allow expandable CCGT by default (#1796)
de69647
@blakeldridge
Fix issue #1792 : updated colours in plot_balance_map (#1793)
91eb24f 
Co-authored-by: Blake Eldridge <blake.eldridge@fnc.co.uk>
@TomKae00 @pre-commit-ci
refactor: update TES standing loss rates to DEA data (#1791)
23c0b84 
* refactor: use standing_losses from cost file instead of tes_tau

* fix: delete widow code

* refactor: add release_notes

* refactor: mention new costs file version in release notes

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

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

* refactor: remove tes_tau from sector.csv config

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@lkstrp
fix: update v1 flag for deprecations (#1797)
5f7ce2b
@dependabot
chore(deps): bump the github-actions group across 1 directory with 2 …
2dee4bd 
…updates (#1798)

Bumps the github-actions group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/checkout` from 4 to 5
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

Updates `actions/download-artifact` from 4 to 5
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@aleks-g
bugfix typo id to ID (#1800)
c7b728d
@lkstrp
fix: update v1 flag for rc (#1802)
4e11346
@euronion
doc: Remove retrieve_natural_earth reference (#1805)
1750b4e
@yerbol-akhmetov
fix missing configtable for clustering (#1811)
0ce827e
@jonathan-peel @pre-commit-ci
Bugfix submodule filenotfounderror (#1768)
ed5f15c 
* Fix FileNotFoundError for rule retrieve_eez

* Fix FileNotFoundError for rule retrieve_nuts_2021_shapes

* Update zip -> zip_file; change to shcopy2

* Fix FileNotFoundError for rule retrieve_nuts_2013_shapes

* Fix FileNotFoundError in rule retrieve_worldbank_urban_population

* Fixed FileNotFoundError in rule retrieve_co2stop

* Fix FileNotFoundError for rule download_wdpa

* Fix FileNotFoundError for rule download_wdpa_marine

* Change zip to zip_file in rule retrieve_aquifer_data_bgr

* Remove unnecessary imports

* Add release note

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

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

* Add link to pull request

* Fix FileNotFoundError for rule retrieve_eurostat_data

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

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

* Remove shadow directory from rule retrieve_eurostat_data

* Add tempory file handling for rule retrieve_eurostat_data

* Fix FileNotFoundError for rule retrieve_eurostat_household_data
Also add management for temporary tarball file

* Update release notes

* Replace shadow directories with manual file deletion.

* Update release notes.

* Removed chmod for windows compatability.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@jonathan-peel @pre-commit-ci @fneum
Bugfix sector attributeerror (#1778)
d9f66dc 
* Fix FileNotFoundError for rule retrieve_eez

* Fix FileNotFoundError for rule retrieve_nuts_2021_shapes

* Update zip -> zip_file; change to shcopy2

* Fix FileNotFoundError for rule retrieve_nuts_2013_shapes

* Fix FileNotFoundError in rule retrieve_worldbank_urban_population

* Fixed FileNotFoundError in rule retrieve_co2stop

* Fix FileNotFoundError for rule download_wdpa

* Fix FileNotFoundError for rule download_wdpa_marine

* Change zip to zip_file in rule retrieve_aquifer_data_bgr

* Remove unnecessary imports

* Add release note

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

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

* Add link to pull request

* Fix FileNotFoundError for rule retrieve_eurostat_data

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

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

* Remove shadow directory from rule retrieve_eurostat_data

* Add tempory file handling for rule retrieve_eurostat_data

* Fix FileNotFoundError for rule retrieve_eurostat_household_data
Also add management for temporary tarball file

* Update release notes

* Replace shadow directories with manual file deletion.

* Update release notes.

* Removed chmod for windows compatability.

* Fix AttributeError in prepare_sector_network.py

* Update release notes

* Update release notes to include link to pull request.

---------

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>
@jonathan-peel @pre-commit-ci @fneum
Bugfix grid valueerror (#1780)
7385364 
* Fix FileNotFoundError for rule retrieve_eez

* Fix FileNotFoundError for rule retrieve_nuts_2021_shapes

* Update zip -> zip_file; change to shcopy2

* Fix FileNotFoundError for rule retrieve_nuts_2013_shapes

* Fix FileNotFoundError in rule retrieve_worldbank_urban_population

* Fixed FileNotFoundError in rule retrieve_co2stop

* Fix FileNotFoundError for rule download_wdpa

* Fix FileNotFoundError for rule download_wdpa_marine

* Change zip to zip_file in rule retrieve_aquifer_data_bgr

* Remove unnecessary imports

* Add release note

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

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

* Add link to pull request

* Fix FileNotFoundError for rule retrieve_eurostat_data

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

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

* Remove shadow directory from rule retrieve_eurostat_data

* Add tempory file handling for rule retrieve_eurostat_data

* Fix FileNotFoundError for rule retrieve_eurostat_household_data
Also add management for temporary tarball file

* Update release notes

* Replace shadow directories with manual file deletion.

* Update release notes.

* Removed chmod for windows compatability.

* Fix AttributeError in prepare_sector_network.py

* Update release notes

* Update release notes to include link to pull request.

* Fix ValueError in function add_storage_and_grids of prepare_sector_network.py

* Add release notes

* Update release notes to include link to pull request.

---------

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>
@github-actions @lkstrp @fneum
Update locked environment files for all platforms (#1803)
e3a5e43 
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
@fneum
handle inconsistent column capitalization (#1816)
151a969
@bobbyxng @pre-commit-ci @fneum
Draft: Implementation of voltage levels 110kV-220kV using osm-raw (#1…
f9cdaf2 
…740)

* 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

* First running workflow for voltage levels 110kV <= v_nom < 220 kV

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

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

* Added 60 kV voltage level

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

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

* Updated example config.

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

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

* Updated configtables to include experimental distribution grid.

* Updated mock_snakemake defaults and added release_note.

* reduce diff

* move distribution-grid line types to config.default.yaml

* remove unnecessary quotation marks

* filter voltage level earlier and use spatial index for speed-up

* merge lines: resolve performance bottleneck

* improve performance for aggregate_to_substations

* remove wrong assumption unit test on present voltage levels

* [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: Fabian Neumann <fabian.neumann@outlook.de>
@fneum
follow-up to #1816
985b82f
@koen-vg
Fix wildcard adjustment options (#1817)
a1032ea 
The `adjustments` config section has gotten an updated schema a while
ago, and the `{opts}` and `{sector_opts}` wildcards (in particular,
the `carrier+{c|p|m}` options) were never updated to respect this new
schema.
@Eric-Nitschke @pre-commit-ci
Fix retrieve_eurostat_data for Windows (#1825)
6b2b9c9 
* 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>
@lkstrp
fix: adjust for pypsa v1 add return change (#1827)
9fa7393
@github-actions @lkstrp
Update locked environment files for all platforms (#1820)
d7338c1 
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
Co-authored-by: Lukas Trippe <lkstrp@pm.me>
@github-actions @lkstrp
Update locked environment files for all platforms (#1832)
3a058b4 
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
@finozzifa
remove pinned environment reference from pre-commit-config (#1837)
cc8ddef 
* remove pinned environment reference from pre-commit-config

* release notes
@tgilon
refactor: use single-line comment for rst (#1839)
3df3152
@bobbyxng
Fix JRC ARDECO API change. (#1850)
12444e7
@dependabot @lkstrp
chore(deps): bump github/codeql-action in the github-actions group (#…
c1f7b10 
…1851)

Bumps the github-actions group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3 to 4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v3...v4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <lkstrp@pm.me>
@pre-commit-ci @lkstrp
[pre-commit.ci] pre-commit autoupdate (#1848)
c0b57e7 
updates:
- [github.com/pre-commit/pre-commit-hooks: v5.0.0 → v6.0.0](pre-commit/pre-commit-hooks@v5.0.0...v6.0.0)
- [github.com/astral-sh/ruff-pre-commit: v0.12.2 → v0.13.3](astral-sh/ruff-pre-commit@v0.12.2...v0.13.3)
- [github.com/snakemake/snakefmt: v0.11.0 → v0.11.2](snakemake/snakefmt@v0.11.0...v0.11.2)
- [github.com/fsfe/reuse-tool: v5.0.2 → v6.0.0](fsfe/reuse-tool@v5.0.2...v6.0.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <lkstrp@pm.me>
euronion and others added 4 commits October 8, 2025 13:52
@euronion @lkstrp
Update minimum pypsa version to 0.33.2 (#1849)
dbc8692 
* Update minimum pypsa version to 0.35.2

* doc: Update release notes

* Update envs/environment.yaml

* Update doc/release_notes.rst

---------

Co-authored-by: Lukas Trippe <lkstrp@pm.me>
@github-actions @lkstrp
Update locked environment files for all platforms (#1843)
d6709ae 
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
@lkstrp
test: remove perfect foresight and mark as not stable (#1853)
39d924d
@lindnemi
Merge remote-tracking branch 'upstream/master' into merge-october-13
c3d7792
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.