From 643a62049b2a2667c4e38b13a89ccd0a687a9e1b Mon Sep 17 00:00:00 2001 From: martacki Date: Fri, 25 Nov 2022 11:08:35 +0100 Subject: [PATCH 1/8] solve_network: move extra_functionality to args --- scripts/solve_network.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 4127b273..6c50c99b 100755 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -392,7 +392,6 @@ def solve_network(n, config, opts="", **kwargs): n, solver_name=solver_name, solver_options=solver_options, - extra_functionality=extra_functionality, **kwargs ) else: @@ -403,7 +402,6 @@ def solve_network(n, config, opts="", **kwargs): track_iterations=track_iterations, min_iterations=min_iterations, max_iterations=max_iterations, - extra_functionality=extra_functionality, **kwargs ) return n @@ -432,6 +430,7 @@ if __name__ == "__main__": n, snakemake.config, opts, + extra_functionality=extra_functionality, solver_dir=tmpdir, solver_logfile=snakemake.log.solver, ) From 94e5f160b0f46764c4c95eed6a7de90ef3d65717 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 10:16:21 +0000 Subject: [PATCH 2/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/solve_network.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 6c50c99b..d1331b0d 100755 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -389,10 +389,7 @@ def solve_network(n, config, opts="", **kwargs): if skip_iterations: network_lopf( - n, - solver_name=solver_name, - solver_options=solver_options, - **kwargs + n, solver_name=solver_name, solver_options=solver_options, **kwargs ) else: ilopf( From 253f6f6bccd448628fe071df80d9a584c7b766d8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 20:21:06 +0000 Subject: [PATCH 3/8] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7333be98..62933f30 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -67,7 +67,7 @@ repos: # Do YAML formatting (before the linter checks it for misses) - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks - rev: v2.4.0 + rev: v2.5.0 hooks: - id: pretty-format-yaml args: [--autofix, --indent, "2", --preserve-quotes] @@ -87,6 +87,6 @@ repos: # Check for FSFE REUSE compliance (licensing) - repo: https://github.com/fsfe/reuse-tool - rev: v1.0.0 + rev: v1.1.0 hooks: - id: reuse From aba84201b71714a3e783d4b372aa093865b665de Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 20:56:00 +0000 Subject: [PATCH 4/8] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62933f30..1038991c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: # Sort package imports alphabetically - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.11.0 hooks: - id: isort args: ["--profile", "black", "--filter-files"] @@ -51,7 +51,7 @@ repos: # Formatting with "black" coding style - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.12.0 hooks: # Format Python files - id: black From b7899787cf2c565d91856076d270a58d4d54ac11 Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Fri, 16 Dec 2022 10:50:20 +0000 Subject: [PATCH 5/8] Fix load variable in reserve constraint --- scripts/solve_network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index d1331b0d..bcb786f0 100755 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -278,7 +278,7 @@ def add_operational_reserve_margin_constraint(n, config): ).sum(1) # Total demand at t - demand = n.loads_t.p.sum(1) + demand = n.loads_t.p_set.sum(1) # VRES potential of non extendable generators capacity_factor = n.generators_t.p_max_pu[vres_i.difference(ext_i)] From 3dac13ac3bae6886fb82723c39fec01d87e54b49 Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Fri, 16 Dec 2022 10:58:24 +0000 Subject: [PATCH 6/8] Update release_notes.rst --- doc/release_notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 812712bc..b1b56416 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -12,6 +12,8 @@ Upcoming Release * Carriers of generators can now be excluded from aggregation in clustering network and simplify network. +* Bugfix in the reserve constraint will increase demand related reserve requirements + PyPSA-Eur 0.6.1 (20th September 2022) ===================================== From d36a44f23c64b4661f5ce57305bf1b88caebc833 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 20:31:18 +0000 Subject: [PATCH 7/8] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1038991c..f1527e44 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: # Sort package imports alphabetically - repo: https://github.com/PyCQA/isort - rev: 5.11.0 + rev: v5.11.3 hooks: - id: isort args: ["--profile", "black", "--filter-files"] @@ -39,7 +39,7 @@ repos: # Make docstrings PEP 257 compliant - repo: https://github.com/PyCQA/docformatter - rev: v1.5.0 + rev: v1.5.1 hooks: - id: docformatter args: ["--in-place", "--make-summary-multi-line", "--pre-summary-newline"] From 09d89130b578da932d8b38d34f855f13de68242e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 21:14:52 +0000 Subject: [PATCH 8/8] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f1527e44..bb48c2db 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: # Sort package imports alphabetically - repo: https://github.com/PyCQA/isort - rev: v5.11.3 + rev: 5.11.4 hooks: - id: isort args: ["--profile", "black", "--filter-files"] @@ -74,7 +74,7 @@ repos: # Format Snakemake rule / workflow files - repo: https://github.com/snakemake/snakefmt - rev: v0.7.0 + rev: v0.8.0 hooks: - id: snakefmt