Merge remote-tracking branch 'origin/main' into features/blocking

Author: MarleneBusch

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.2 # Use the sha / tag you want to point at
+    rev: v1.19.1 # Use the sha / tag you want to point at
     hooks:
       - id: mypy
         additional_dependencies:
@@ -14,7 +14,7 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.2
+    rev: v0.14.11
     hooks:
       - id: ruff
         args: [ --fix ]

CONTRIBUTING.md

@@ -122,18 +122,29 @@ as shown below. Do not include attributes and methods of the parent class explic
      Sphinx autoapi will automatically generate links to the parent class documentation.
 
 
-6. **Commit Changes**: Commit your changes with a clear and concise commit message that describes what you have changed.
+6. **Test Changes**: Test all existing and added functionality.
+    * ``ARTIST`` uses ``pytest`` for running the test suite. If you followed all of the above steps correctly, you already have the project and all dependencies installed. All of our tests are located in the ``tests/`` directory. Please also add your tests into the ``tests/`` directory.
+    * To run all tests execute:
+        ```bash
+        pytest tests/
+        ```
+    * To run the tests with coverage:
+        ```bash
+        pytest --cov=artist tests/
+        ```
+
+7. **Commit Changes**: Commit your changes with a clear and concise commit message that describes what you have changed.
    Example:
    ```bash
    git commit -m "add rotation control for heliostat"
    ```
 
-7. **Push Changes**: Push your changes to your fork on GitHub:
+8. **Push Changes**: Push your changes to your fork on GitHub:
    ```bash
    git push origin features/your-feature-name
    ```
 
-8. **Open a Pull Request**: Go to the [original repository](https://github.com/ARTIST-Association/ARTIST.git) and click the "New Pull Request" button. Follow the guidelines in the template to submit your pull request. Resolve possible merge conflicts with the current main branch.
+9. **Open a Pull Request**: Go to the [original repository](https://github.com/ARTIST-Association/ARTIST.git) and click the "New Pull Request" button. Follow the guidelines in the template to submit your pull request. Resolve possible merge conflicts with the current main branch.
 
 ## Code of Conduct
 

README.md

@@ -99,6 +99,9 @@ The ``ARTIST`` documentation includes:
 Check out our [contribution guidelines](CONTRIBUTING.md) if you are interested in contributing to the `ARTIST` project :fire:.
 Please also carefully check our [code of conduct](CODE_OF_CONDUCT.md) :blue_heart:.
 
+## How to test our software
+For detailed instructions on testing, please refer to point 6 of the [contribution guidelines](CONTRIBUTING.md).
+
 ## Acknowledgments
 This work is supported by the [Helmholtz AI](https://www.helmholtz.ai/) platform grant.
 

joss_paper/paper.bib

@@ -80,7 +80,7 @@ @article{Carballo:2025
     pages = {124574},
     year = {2025},
     issn = {0306-2619},
-    doi = {https://doi.org/10.1016/j.apenergy.2024.124574},
+    doi = {10.1016/j.apenergy.2024.124574},
     url = {https://www.sciencedirect.com/science/article/pii/S0306261924019573},
     author = {J.A. Carballo and J. Bonilla and N.C. Cruz and J. Fernández-Reche and J.D. Álvarez and A. Avila-Marin and M. Berenguel},
 }