Merge branch 'master' into extra_functionality_to_args

2022-12-07 15:38:17 +01:00 · 2022-12-07 15:38:17 +01:00 · e632381560
commit e632381560
parent 94e5f160b0 01cc146733
2 changed files with 2 additions and 2 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -5,7 +5,7 @@ exclude: "^LICENSES"

 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
  hooks:
  - id: check-merge-conflict
  - id: end-of-file-fixer
--- a/envs/environment.yaml
+++ b/envs/environment.yaml
@ -10,7 +10,7 @@ dependencies:
 - python>=3.8
 - pip

- pypsa>=0.20
+- pypsa>=0.21.2
 - atlite>=0.2.9
 - dask