diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e892057e2..5887ac014 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: - cron: "0 5 * * TUE" env: - CACHE_NUMBER: 2 # Change this value to manually reset the environment cache + CACHE_NUMBER: 1 # Change this value to manually reset the environment cache jobs: build: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 54c3bcd16..32f9b1175 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,12 +35,15 @@ repos: types_or: [python, rst, markdown] files: ^(scripts|doc)/ -# Make docstrings PEP 257 compliant -- repo: https://github.com/PyCQA/docformatter - rev: v1.7.5 - hooks: - - id: docformatter - args: ["--in-place", "--make-summary-multi-line", "--pre-summary-newline"] +# # Make docstrings PEP 257 compliant +# - repo: https://github.com/PyCQA/docformatter +# rev: v1.7.5 +# hooks: +# - id: docformatter +# args: ["--in-place", "--make-summary-multi-line", "--pre-summary-newline"] +# entry: docformatter +# language: python +# types: [python] - repo: https://github.com/keewis/blackdoc rev: v0.3.9 diff --git a/README.md b/README.md index c424dfe34..c20cde919 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,7 @@ by ## Development Status: **Stable and Active** -[![Status Linux](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-linux.yaml/badge.svg?branch=main&event=push)](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-linux.yaml) -[![Status Mac](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-mac.yaml/badge.svg?branch=main&event=push)](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-mac.yaml) -[![Status Windows](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-windows.yaml/badge.svg?branch=main&event=push)](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-windows.yaml) +[![Test workflows](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci.yml/badge.svg)](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci.yml) [![Documentation Status](https://readthedocs.org/projects/pypsa-earth/badge/?version=latest)](https://pypsa-earth.readthedocs.io/en/latest/?badge=latest) ![Size](https://img.shields.io/github/repo-size/pypsa-meets-earth/pypsa-earth) [![License: AGPL v3](https://img.shields.io/badge/License-AGPLv3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) @@ -311,14 +309,35 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe Emmanuel Bolarinwa + + + Eddy-JV +
+ Eddy Jalbout + + + + + + doneachh +
+ Anton Achhammer + + Tomkourou
Thomas Kouroughli - - + + + + finozzifa +
+ Finozzifa + + GridGrapher @@ -327,12 +346,20 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe - - finozzifa + + glenkiely-ieg
- Finozzifa + Null + + + cpschau +
+ Cschau + + + Emre-Yorat89 @@ -360,14 +387,6 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
Ekaterina-Vo - - - - - cpschau -
- Cschau - @@ -377,24 +396,25 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe - - doneachh + + carlosfv92
- Anton Achhammer + Carlos Fernandez - + + - - asolavi + + rajesh-ieg
Null - - carlosfv92 + + asolavi
- Carlos Fernandez + Null @@ -403,8 +423,7 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
Stephen J Lee - - + rsparks3 @@ -425,7 +444,8 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
Juli-a-ko - + + squoilin @@ -446,8 +466,7 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
Pietro Monticone - - + Netotse @@ -468,7 +487,8 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
Jess - + + jarry7 @@ -489,8 +509,7 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
EmreYorat - - + AndreCNF diff --git a/doc/index.rst b/doc/index.rst index 0f7e5c20c..52ef166ae 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -14,17 +14,9 @@ Welcome to the PyPSA-Earth documentation! .. image:: https://img.shields.io/github/v/release/pypsa-meets-earth/pypsa-earth?include_prereleases :alt: GitHub release (latest by date including pre-releases) -.. image:: https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-linux.yaml/badge.svg - :target: https://github.com/pypsa-meets-earth/pypsa-earth/actions - :alt: CI Linux - -.. image:: https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-mac.yaml/badge.svg - :target: https://github.com/pypsa-meets-earth/pypsa-earth/actions - :alt: CI Mac - -.. image:: https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci-windows.yaml/badge.svg - :target: https://github.com/pypsa-meets-earth/pypsa-earth/actions - :alt: CI Windows +.. image:: https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci.yml/badge.svg + :target: https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci.yml + :alt: CI .. image:: https://readthedocs.org/projects/pypsa-earth/badge/?version=latest :target: https://pypsa-earth.readthedocs.io/en/latest/?badge=latest diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 360b56529..4fc2d0f75 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -30,7 +30,9 @@ E.g. if a new rule becomes available describe how to use it `make test` and in o * Enable configfile specification for mock_snakemake `PR #1135 `_ -* Use sumodule prefix in rules and `_helpers.py` script for facilitate smooth module import `PR #1137 `_ +* Fix pre-commit docformatter python issue. `PR #1153 `__ + +* Use BASE_DIR in rules and `_helpers.py` script for facilitate module import in subworkflow `PR #1137 `_ PyPSA-Earth 0.4.1 =================