Commit Graph

149 Commits

Author SHA1 Message Date
cpschau
0221372b49
modified environments to include tabula-py update and fixed PDF econding (#1219) 2024-08-15 14:52:33 +02:00
Philipp Glaum
a9f67b313f
handle new and upgraded TYNDP&NEP lines/links in base network (OSM compatible) (#1085)
* add general implementation to add tyndp and nep. TODO: Remove duplicate?

* pre_osm_merge

* clean and update base_network.py
update default config settings

* clean and update base_network.py
update default config settings

* base_network.py:remove adding of transmission projects
add_transmission_project.py: add new script for creating lines and link csv from transmission projects
add_electricity.py: add new projects from created csv files

* cluster_network.py: do not allow to group lines with different build years together-> requires pypsa update
simplify_network.py: fix bug of simplify links

* remove legacies of removing transmission projects from base_network

* restructure folders:new folder for tranmission project csv
add_transmission_projects: improve logging, cleanup

* update lines csvs and add default line type for upgraded and new lines

* remove duplicate lines which were already in gridkit

* allow to connect ac lines only to ac buses

* add manual links csv (adjusted links_tyndp.csv) and update default config

* add realease note

* remove links_tyndp.csv file, references in build_elec.smk and function in base_network.py to add them

* add configuration options for transmission projects to documentation and add template folder for transmission projects

* update pypsa version in environments

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

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

* integrate Fabian's review comments 2

* add electricity:add import pathlib and duplicate printing out of adding line projects

* update NEP line csv

* address Fabian's comments

* build_transmission_projects: address Fabian's final comments
simplify_network: use modus to get line type which appears most often

* build_transmission_project: change from .geometry to ["geometry"]

* build_transmission_projects: remove redundanty line

* build_transmission_projects: remove buffer for europe shape because of higher resolution
default config: fix wrong key for skip argument in transmission_projects

* update configtables and default config

* update manual links csv and delete undetected duplicate links in tyndp2020

* final adjustments

---------

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>
2024-08-15 11:42:21 +02:00
Fabian Neumann
fb41016c60
EEZ: Update EEZ to v12, auto-download and remove from databundle (#1188)
* eez: update to version 12, autodownload, remove pycountry

* eez: do not simplify as it distorts topology

* remove missed merge conflicts
2024-08-07 15:28:55 +02:00
Fabian Neumann
c3151902f6
Compatibility with geopandas version 1 (#1136)
* address geopandas and pandas deprecations/warnings

* compatibility with geopandas v1

* [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>
2024-07-08 08:29:16 +02:00
Martha Frysztacki
358561a619
Update envs/environment.yaml
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-03 08:33:03 +02:00
Martha Frysztacki
061fd00bd1
Merge branch 'master' into fix_env 2024-07-01 15:10:18 +02:00
martacki
bba4857025 restrict geopandas until conflicts are resolved 2024-07-01 15:07:20 +02:00
Fabian Neumann
14b8de8348 compatibility with snakemake 8.14 closes #1108 2024-06-20 14:38:04 +02:00
Fabian Neumann
4b1ecca690 fix reuse of envs/*.yaml 2024-05-26 07:25:40 +02:00
Fabian Neumann
1da76dd1ae
prepare release v0.11.0 (#1081)
* prepare release notes v0.11.0

* streamline release notes

* update envs/environment.fixed.yaml

* doc: update workflow DAGs

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

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

* pre-commit formatting [no ci]

* update envs/environment.fixed.yaml

* [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>
2024-05-25 22:47:04 +02:00
Fabian Neumann
9b50c846a0 solve: add option for post-discretization of lines and links 2024-05-15 14:56:50 +02:00
Fabian Neumann
2b0303e913 bump powerplantmatching to 0.5.15 2024-05-12 18:06:50 +02:00
Fabian Hofmann
2db729f872
Update environment.fixed.yaml 2024-05-03 10:27:05 +02:00
Fabian
91e990c0b0 update env fixed 2024-05-03 09:36:40 +02:00
Fabian Neumann
03fd9bfb52
Merge pull request #1018 from koen-vg/existing-caps-from-pm
Use powerplantmatching IRENASTAT for renewable capacities in `add_existing_baseyear`
2024-04-30 15:15:37 +02:00
Fabian Neumann
edc1d4991a reenable windows ci with snakemake 8.11 2024-04-26 09:35:54 +02:00
Koen van Greevenbroek
884d308d8b Bump powerplantmatching version
Needed in order to get renewable capacities from pm.IRENA newer than
2020; updated to 2023 in version 0.5.13
2024-04-25 17:45:51 +02:00
Fabian Neumann
e19e38b149 update version requirements for retrieve.yaml 2024-03-11 08:59:26 +01:00
Fabian Neumann
ed71978b92 use humanfriendly walltime specifications 2024-03-09 14:47:01 +01:00
Fabian Neumann
c8eb46a39c add generic cluster snakemake plugin 2024-03-09 12:07:15 +01:00
Fabian Neumann
d983d79ed2 Merge branch 'master' into snakemake-8 2024-03-08 17:50:08 +01:00
Fabian Neumann
b6542d275f add snakemake slurm plugin to env 2024-03-08 17:45:54 +01:00
pre-commit-ci[bot]
ac2322cd16 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-20 10:03:34 +01:00
Fabian Neumann
f39fd1441a update fixed versions environment.yaml 2024-02-19 17:23:41 +01:00
Fabian Neumann
16e2286188 update copyright years to 2024 2024-02-19 16:21:48 +01:00
Fabian Neumann
cc77456195 env: add pre-commit 2024-02-02 10:11:59 +01:00
Fabian
bd55e368f7 test: revert setting highs as default solver, as not available for macos 2024-01-31 13:04:46 +01:00
Fabian
b7750d21ea CI: use scip and highs as solvers for clustering and solving, instead of ipopt and glpk 2024-01-31 09:44:13 +01:00
Fabian
56b22a3b4e env: correct pyscipopt dependency
cluster_network: address deprecation warning
2024-01-30 10:29:08 +01:00
Fabian
81e7c4eb67 remove pyomo dependency in cluster network, use scip as OS solver 2024-01-29 12:08:56 +01:00
Fabian Neumann
9f0555863b powerplantmatching: block version 0.5.9 with breaking bug 2024-01-23 18:19:46 +01:00
Koen van Greevenbroek
48974edc8d Make data retrieval rules use their own minimal conda env
This means that the main conda environment can be changed for
development purposes without necessitating the re-running of data
retrieval due to software environment change by default.
2024-01-23 16:27:12 +01:00
euronion
91843ace93 Restore REUSE compatability for environment.fixed.yaml 2024-01-08 09:48:06 +01:00
pre-commit-ci[bot]
6e630a85e1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-08 08:33:52 +00:00
Fabian Neumann
b2744bc0ca update envs/environment.fixed.yaml 2024-01-05 17:36:35 +01:00
pre-commit-ci[bot]
27ee2666be [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-31 13:13:10 +00:00
Fabian Neumann
ea95f2b38c bumb minimum snakemake version to v8 2023-12-31 13:01:17 +01:00
Fabian Neumann
48850431fb Snakefile: switch to new storage providers 2023-12-30 14:37:45 +01:00
Fabian Neumann
4349903a72 env: remove snakemake upper version constraint 2023-12-30 14:36:18 +01:00
Fabian Neumann
9761988859 increase pypsa min version to 0.26.1 2023-12-29 11:32:53 +01:00
euronion
31f77bc888 Update environment.yaml 2023-12-21 17:52:34 +01:00
euronion
17a4f53b9d Restrict snakemake version to < 8.0.0 2023-12-21 11:57:24 +01:00
Fabian Hofmann
68aef7b628
constrain xarray more recent version 2023-12-18 11:23:32 +01:00
martacki
84d38228ae fix environment 2023-12-18 09:35:17 +01:00
Fabian Neumann
b96bcf11a4 relax pypsa version constraint to allos 0.26.0 2023-12-12 18:31:24 +01:00
Fabian Neumann
1b88dc7660 limit pypsa version until #793 resolved 2023-12-06 10:14:31 +01:00
Fabian Neumann
4df6370198 update environment: matplotlib, xarray, pypsa 2023-12-04 14:39:23 +01:00
Fabian Neumann
86bfdcf20c temporarily limit linopy version 2023-11-30 11:50:20 +01:00
Fabian Neumann
7884392326
Merge pull request #748 from PyPSA/follow-up-637
follow-up to #637: remove duplicate code and update tsam version
2023-10-18 10:27:29 +02:00
martacki
29fad3d638 change environment name back to pypsa-eur 2023-10-12 17:11:41 +02:00