Commit Graph

1238 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
3c099095dc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-06 20:51:51 +00:00
Fabian Neumann
3d4af04d88 update eia hydro data, fix missing merge conflict 2023-01-06 21:51:33 +01:00
pre-commit-ci[bot]
acc6ee6bfe [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-06 17:46:06 +00:00
Fabian Neumann
1ebe53cdac merge master 2023-01-06 18:45:36 +01:00
Fabian Neumann
58c0242312 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2022-12-28 15:10:54 +01:00
Fabian Neumann
c9dc64e0ed limit matplotlib < 3.6 2022-12-28 15:10:45 +01:00
Fabian Neumann
c17ae85f9b HVDC links Sweden Germany parameter correction 2022-12-28 12:15:17 +01:00
Fabian Neumann
8b363fe108 env: remove pygeos dependency 2022-12-28 11:21:52 +01:00
Fabian Neumann
67b3c964d4 env: add pygeos dependency >= 0.11 2022-12-28 11:11:13 +01:00
Fabian Neumann
9e1eec9c9d env: add pygeos dependency 2022-12-28 11:10:19 +01:00
Fabian Neumann
5360eb0a2e Merge branch 'master' of https://github.com/pypsa/pypsa-eur 2022-12-28 09:35:15 +01:00
Fabian Neumann
a08c20d7c8 build_shapes: cleanup shape union of RS and KV 2022-12-28 09:35:11 +01:00
Fabian Neumann
bb5c5bd143 simplify_networks: add control for removing stubs II 2022-12-28 09:34:28 +01:00
Fabian Neumann
780834ad87 tyndp: add greenlink and celtic interconnector 2022-12-28 09:33:36 +01:00
Fabian Neumann
e9f3d20432 simplify_networks: add control for removing stubs 2022-12-28 09:33:08 +01:00
Fabian Neumann
27d4af8e65 entsoegridkit: additional parameter corrections 2022-12-28 09:31:48 +01:00
Fabian Neumann
bb1b37e8ef address pandas iteritems deprecation 2022-12-27 13:16:05 +01:00
Fabian Neumann
2aa67bdf9f add atlite control for progressbar to configs 2022-12-27 13:03:12 +01:00
Fabian Neumann
69a33e3698 increase resource requirements of some rules 2022-12-27 12:16:02 +01:00
Fabian Neumann
c025e87b6d
Merge pull request #457 from PyPSA/update-env
update pypsa 0.21.3, vresutils master, lift fiona version restriction
2022-12-27 11:51:24 +01:00
Fabian Neumann
70cea4aea3 revert to shapely<2.0 2022-12-27 11:51:01 +01:00
Fabian Neumann
e14382239e try shapely 2.0 2022-12-27 11:43:02 +01:00
Fabian Neumann
70d07d561f address pandas deprecations 2022-12-27 11:42:32 +01:00
Fabian Neumann
8bd840c252 limit numpy < 1.24 2022-12-27 11:30:33 +01:00
Fabian Neumann
bab7c3128d
Merge branch 'master' into update-env 2022-12-27 10:51:49 +01:00
Fabian Neumann
06bee06d56 update pypsa, vresutils master, lift fione restriction 2022-12-27 10:51:02 +01:00
Fabian Neumann
63de3e5f88
Merge pull request #456 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-27 07:48:45 +01:00
pre-commit-ci[bot]
09d89130b5
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: v5.11.3 → 5.11.4](https://github.com/PyCQA/isort/compare/v5.11.3...5.11.4)
- [github.com/snakemake/snakefmt: v0.7.0 → v0.8.0](https://github.com/snakemake/snakefmt/compare/v0.7.0...v0.8.0)
2022-12-26 21:14:52 +00:00
Fabian Hofmann
bff0ae2f0f
Merge pull request #453 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-20 09:49:27 +01:00
pre-commit-ci[bot]
d36a44f23c
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: 5.11.0 → v5.11.3](https://github.com/PyCQA/isort/compare/5.11.0...v5.11.3)
- [github.com/PyCQA/docformatter: v1.5.0 → v1.5.1](https://github.com/PyCQA/docformatter/compare/v1.5.0...v1.5.1)
2022-12-19 20:31:18 +00:00
Fabian Neumann
a22dc9238d
Merge pull request #451 from PyPSA/pz-max-patch-1
Fix load variable in reserve constraint
2022-12-16 13:18:57 +01:00
Max Parzen
3dac13ac3b
Update release_notes.rst 2022-12-16 10:58:24 +00:00
Max Parzen
b7899787cf
Fix load variable in reserve constraint 2022-12-16 10:50:20 +00:00
Fabian Neumann
bc8ac24c33
Merge pull request #449 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-15 10:52:10 +01:00
pre-commit-ci[bot]
aba84201b7
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: 5.10.1 → 5.11.0](https://github.com/PyCQA/isort/compare/5.10.1...5.11.0)
- [github.com/psf/black: 22.10.0 → 22.12.0](https://github.com/psf/black/compare/22.10.0...22.12.0)
2022-12-12 20:56:00 +00:00
Fabian Neumann
cf56810fcc
Merge pull request #445 from PyPSA/extra_functionality_to_args
solve_network: move extra_functionality to args
2022-12-08 14:32:09 +01:00
Fabian Neumann
8421c46e7d
Merge branch 'master' into extra_functionality_to_args 2022-12-08 14:31:57 +01:00
Fabian Neumann
d6eea55be4
Merge pull request #447 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-08 14:30:07 +01:00
Martha Frysztacki
e632381560
Merge branch 'master' into extra_functionality_to_args 2022-12-07 15:38:17 +01:00
Fabian Neumann
01cc146733 lift minimum pypsa version, pyomo 6.4.3 compatibility 2022-12-06 14:38:40 +01:00
pre-commit-ci[bot]
253f6f6bcc
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.4.0 → v2.5.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.4.0...v2.5.0)
- [github.com/fsfe/reuse-tool: v1.0.0 → v1.1.0](https://github.com/fsfe/reuse-tool/compare/v1.0.0...v1.1.0)
2022-12-05 20:21:06 +00:00
Fabian Neumann
4d40893fd9
Merge pull request #446 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-29 11:39:00 +01:00
pre-commit-ci[bot]
5220d80564
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.4.0)
2022-11-28 21:18:51 +00:00
pre-commit-ci[bot]
94e5f160b0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-25 10:16:23 +00:00
martacki
643a62049b solve_network: move extra_functionality to args 2022-11-25 11:08:35 +01:00
Fabian Neumann
dcd394dd0a
Merge pull request #441 from PyPSA/shapely-geometry-length
build_bus_regions: fix shapely deprecation
2022-11-15 07:58:15 +01:00
Fabian
727688749c build_bus_regions: fix shapely deprecation 2022-11-15 07:45:13 +01:00
Fabian Neumann
5faaad02fa
Merge pull request #440 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-14 21:51:17 +01:00
pre-commit-ci[bot]
9eab3caf93
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/snakemake/snakefmt: v0.6.1 → v0.7.0](https://github.com/snakemake/snakefmt/compare/v0.6.1...v0.7.0)
2022-11-14 20:20:13 +00:00
Fabian Neumann
a32b45dd23
Merge pull request #439 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-07 20:40:40 +01:00