bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,566 Commits 1 Branch 0 Tags 133 MiB
62bcded800
Commit Graph

3566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
c900f849de
Merge pull request #828 from PyPSA/fix-deprecations 
Address recent deprecations
 2024-01-02 17:04:07 +01:00
pre-commit-ci[bot]
e580ac85d9 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-01-02 15:33:11 +00:00
Fabian Neumann
30c1a1c857 address deprecation warnings 2024-01-02 16:31:48 +01:00
Fabian Neumann
e3539b0e69 heat vent: add bus 2024-01-02 16:31:16 +01:00
pre-commit-ci[bot]
f494dd85b9 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-01-02 15:21:51 +00:00
Tom Brown
1b569dde1b move code for national CO2 budgets out of extra_functionality 
This can be added by derived workflows like PyPSA-Eur via
additional_functionality.

Changed additional_functionality to pass snakemake rather than
wildcards and config separately. This gives maximal flexibility.
 2024-01-02 16:02:10 +01:00
Fabian Neumann
340bf77849 clarify that source_path is relative to directory 2024-01-02 16:01:28 +01:00
Fabian Neumann
f28e9b47d2 add custom_extra_functionality param to solve_electricity rule 2024-01-02 16:00:41 +01:00
Fabian Neumann
ceddecd705
Merge pull request #648 from PyPSA/misc/deprecations 
[DNMY] Address pandas deprecation of date_parser for pandas.read_csv
 2024-01-02 09:35:25 +01:00
Fabian Neumann
1417ed7554
Merge pull request #826 from jessLryan/broken_link 
Update index.rst
 2024-01-02 07:13:29 +01:00
Jess
adf2c96dc1 Update index.rst 
fixed 2 broken links
 2024-01-01 12:14:38 +00:00
Fabian Neumann
79ca64382b correct path for custom_extra_functionality 2023-12-31 14:15:37 +01:00
Fabian Neumann
3c4e877844 Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality 2023-12-29 17:30:08 +01:00
Fabian Neumann
a5ba2565a0 correct config location 2023-12-29 17:30:03 +01:00
pre-commit-ci[bot]
876a28b688 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-29 16:23:55 +00:00
Fabian Neumann
fa13eae277 Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality 2023-12-29 17:23:24 +01:00
Fabian Neumann
4b6dd29083 add dummy file and assert path exists 2023-12-29 17:23:11 +01:00
pre-commit-ci[bot]
fba320bfa7 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-29 16:20:26 +00:00
Fabian Neumann
8a11bdb4b1 solve_network: option to inject custom extra functionalities from source file 2023-12-29 17:19:19 +01:00
Fabian Neumann
0f6887793b
Merge pull request #820 from PyPSA/pypsa-0.26.1 
increase pypsa min version to 0.26.1
 2023-12-29 15:43:09 +01:00
pre-commit-ci[bot]
de3b6c9573 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-29 11:38:43 +00:00
Fabian Neumann
71985d5e3a validate checksums for zenodo downloads 2023-12-29 12:34:14 +01:00
Fabian Neumann
a54d00d745
Merge pull request #819 from PyPSA/retrieve-to-data 
Retrieve GLC and WDPA to data directory, not resources
 2023-12-29 11:37:14 +01:00
Fabian Neumann
e097aa48ae
Merge branch 'master' into misc/deprecations 2023-12-29 11:36:19 +01:00
Fabian Neumann
9761988859 increase pypsa min version to 0.26.1 2023-12-29 11:32:53 +01:00
Fabian Neumann
02b0996dac remove write-protection on resources/natura.tiff 2023-12-29 11:29:19 +01:00
Fabian Neumann
4f815a9cd7 move wdpa and glc datasets to data directory and protect 2023-12-29 11:29:01 +01:00
Fabian Neumann
6ee82e030f
Merge pull request #818 from PyPSA/wdpa-no-bYYYY 
WDPA time-invariant resource files
 2023-12-29 11:22:24 +01:00
Fabian Neumann
accffe7bc2 wdpa time-invariant filenames in build_electricity.smk 2023-12-29 11:21:24 +01:00
Fabian Neumann
c5f48f957d wdpa: give snakemake appearance of time-invariant wdpa files 2023-12-29 11:20:40 +01:00
Fabian Neumann
471c97d499 wdpa: correct _shp url 2023-12-29 11:20:14 +01:00
Fabian Neumann
396fdee6f1
Merge pull request #812 from Climact/fix/typo-prepare-sector-network 
Fix typo in buses definition for oil boilers in add_industry in prepare_sectors_networks
 2023-12-29 10:47:41 +01:00
Fabian Neumann
40b7cc1f51
Merge pull request #811 from PyPSA/fix/retrieve-wdpa 
Check WDPA url also a month forward
 2023-12-29 10:46:29 +01:00
Fabian Neumann
57b4724ebe
Merge pull request #803 from millingermarkus/master 
Added co2 storage shadow price output to csv
 2023-12-29 10:41:41 +01:00
Fabian Neumann
9551642c95
Merge pull request #815 from PyPSA/pre-commit-ci-update-config 
[pre-commit.ci] pre-commit autoupdate
 2023-12-29 10:39:04 +01:00
pre-commit-ci[bot]
3c3d49017e
[pre-commit.ci] pre-commit autoupdate 
updates:
- [github.com/psf/black: 23.12.0 → 23.12.1](https://github.com/psf/black/compare/23.12.0...23.12.1)
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.11.0 → v2.12.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.11.0...v2.12.0)
 2023-12-25 18:33:27 +00:00
pre-commit-ci[bot]
fec641ce0a [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-22 13:41:25 +00:00
euronion
d817212896 Fix missing bYYYY 2023-12-22 14:40:30 +01:00
Fabian Hofmann
97b20bc170
Merge branch 'master' into fix/retrieve-wdpa 2023-12-21 23:16:11 +01:00
Fabian Hofmann
ea6bcc9b20
Merge branch 'master' into fix/retrieve-wdpa 2023-12-21 23:15:58 +01:00
Fabian Hofmann
b5f8e8d206
Merge branch 'master' into fix/retrieve-wdpa 2023-12-21 23:14:56 +01:00
Fabian Hofmann
c3fd0e2177
Merge pull request #810 from PyPSA/env/restrict-snakemake 2023-12-21 23:14:28 +01:00
pre-commit-ci[bot]
3a474af71f [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-21 17:40:48 +00:00
euronion
25c5751565 Check WDPA url also a month forward 2023-12-21 18:39:06 +01:00
euronion
31f77bc888 Update environment.yaml 2023-12-21 17:52:34 +01:00
euronion
f251e89269 Update release_notes.rst 2023-12-21 17:52:31 +01:00
Tom Brown
8a55a55d20 copperplate oil/methanol supply; allow demand to be regional 
Force a single supply bus for oil/methanol (until we allow
oil/methanol transport). Introduce new config switches
"regional_oil/methanol_demand" that allow demand to be
regionalised. This is important if regional CO2 budgets need to be
enforced.
 2023-12-21 16:08:43 +01:00
euronion
17a4f53b9d Restrict snakemake version to < 8.0.0 2023-12-21 11:57:24 +01:00
Tom Brown
b3753d73d7 undo addition of script to allow cost modifications 
This undoes commit 830019a6e5.

Reason: this was introduced for the PyPSA-Ariadne derivative, but
can be handled more elegantly within the derivative repository.
 2023-12-20 09:22:40 +01:00
pre-commit-ci[bot]
64300c26e5
[pre-commit.ci] pre-commit autoupdate (#806) 
updates:
- [github.com/PyCQA/isort: 5.13.0 → 5.13.2](https://github.com/PyCQA/isort/compare/5.13.0...5.13.2)
- [github.com/psf/black: 23.11.0 → 23.12.0](https://github.com/psf/black/compare/23.11.0...23.12.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2023-12-18 19:25:43 +00:00