From 6c17da2afd288a1ddeb42f0c0a9d6c7c5892c8d8 Mon Sep 17 00:00:00 2001 From: Marie Weiel Date: Tue, 8 Oct 2024 18:05:09 +0200 Subject: [PATCH 1/6] update CITATION.cff file with abstract --- CITATION.cff | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 998c49c..c3f9d36 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -11,54 +11,67 @@ authors: - given-names: Max family-names: Pargmann email: max.pargmann@dlr.de - affiliation: German Aerospace Center + affiliation: German Aerospace Center (DLR) orcid: 'https://orcid.org/0000-0002-4705-6285' - given-names: Kaleb family-names: Phipps email: kaleb.phipps@kit.edu - affiliation: Karlruhe Institute of Technology + affiliation: Karlsruhe Institute of Technology (KIT) orcid: 'https://orcid.org/0000-0002-9197-1739' - given-names: Marie family-names: Weiel email: marie.weiel@kit.edu - affiliation: Karlruhe Institute of Technology + affiliation: Karlsruhe Institute of Technology (KIT) orcid: 'https://orcid.org/0000-0001-9648-4385' - given-names: Mathias family-names: Kuhl email: mathias.kuhl@dlr.de - affiliation: German Aerospace Center + affiliation: German Aerospace Center (DLR) orcid: 'https://orcid.org/0000-0003-0097-7260' - given-names: Marlene family-names: Busch email: marlene.busch@dlr.de - affiliation: German Aerospace Center - - given-names: Fehlix + affiliation: German Aerospace Center (DLR) + - given-names: Felix family-names: Göhring - email: Felix.Goehring@dlr.de - affiliation: German Aerospace Center - - given-names: 'Daniel ' + email: felix.goehring@dlr.de + affiliation: German Aerospace Center (DLR) + - given-names: Daniel family-names: Maldonado Quinto - email: Daniel.MaldonadoQuinto@dlr.de - affiliation: German Aerospace Center + email: daniel.maldonadoquinto@dlr.de + affiliation: German Aerospace Center (DLR) - given-names: Robert family-names: Pitz-Paal orcid: 'https://orcid.org/0000-0002-3542-3391' - email: Robert.Pitz-Paal@dlr.de - affiliation: German Aerospace Center + email: rRobert.pitz-paal@dlr.de + affiliation: German Aerospace Center (DLR) - given-names: Moritz family-names: Leibauer - email: Moritz.Leibauer@synhelion.com + email: moritz.leibauer@synhelion.com affiliation: Synhelion Germany - given-names: Markus family-names: Götz email: markus.goetz@kit.edu - affiliation: Karlruhe Institute of Technology + affiliation: Karlsruhe Institute of Technology (KIT) orcid: 'https://orcid.org/0000-0002-2233-1041' repository-code: 'https://github.com/ARTIST-Association/PAINT' url: 'https://www.paint-database.org' -repository: 'https://github.com/ARTIST-Association' +abstract: >- + The PAINT database makes operational data of concentrating + solar power plants available in accordance with the FAIR + data principles, i.e., making them findable, accessible, + interoperable, and reusable. Currently, the data + encompasses calibration images, deflectometry + measurements, kinematic settings, and weather information + of the concentrating solar power plant in Jülich, Germany, + with the global power plant id (GPPD) WRI1030197. Metadata + for all database entries follow the spatio-temporal asset + catalog (STAC) standard. PAINT closely follows open + science guidelines and makes all software to (pre-)process + data publicly available in the project's source code + repository. keywords: - - Solar Tower + - Solar Tower Power Plant - Concentrated Solar Energy - Database - Heliostat Calibration From 1fb519d1306f6d33f95361883b9674a02916fb50 Mon Sep 17 00:00:00 2001 From: Marie Weiel Date: Tue, 8 Oct 2024 18:09:33 +0200 Subject: [PATCH 2/6] add FAIR4RS action --- .github/workflows/fair-software.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/fair-software.yml diff --git a/.github/workflows/fair-software.yml b/.github/workflows/fair-software.yml new file mode 100644 index 0000000..dbeab05 --- /dev/null +++ b/.github/workflows/fair-software.yml @@ -0,0 +1,17 @@ +name: fair-software + +on: + push: + branches: [main] + +jobs: + verify: + name: "fair-software" + runs-on: ubuntu-latest + steps: + - uses: fair-software/howfairis-github-action@0.2.1 + name: Measure compliance with fair-software.eu recommendations + env: + PYCHARM_HOSTED: "Trick colorama into displaying colored output" + with: + MY_REPO_URL: "https://github.com/${{ github.repository }}" From 9cd6a7935bc2d40b7466293b87e9a9b1dec66f07 Mon Sep 17 00:00:00 2001 From: Marie Weiel Date: Tue, 8 Oct 2024 18:17:32 +0200 Subject: [PATCH 3/6] add codecov and license badge --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index de2456f..dd6b460 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,11 @@ # PAINT [![](https://img.shields.io/badge/Python-3.9+-blue.svg)](https://www.python.org/downloads/) -[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)[![](https://img.shields.io/badge/Python-3.9+-blue.svg)](https://www.python.org/downloads/)[![](https://img.shields.io/badge/Contact-artist%40lists.kit.edu-orange?label=Contact)](artist@lists.kit.edu) -![](./coverage.svg) +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) +[![](https://img.shields.io/badge/Contact-artist%40lists.kit.edu-blue?label=Contact)](artist@lists.kit.edu) +[![fair-software.eu](https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8B%20%20%E2%97%8F%20%20%E2%97%8B-orange)](https://fair-software.eu) +[![codecov](https://codecov.io/gh/ARTIST-Association/PAINT/graph/badge.svg?token=B2pjCVgOhc)](https://codecov.io/gh/ARTIST-Association/PAINT) ## What is ``PAINT`` From 29580c2575d56a5b12374aa3b54e139244843a25 Mon Sep 17 00:00:00 2001 From: Marie Weiel Date: Tue, 8 Oct 2024 18:18:19 +0200 Subject: [PATCH 4/6] use codecov action instead of generating and pushing badge using a bot --- .github/workflows/python-test.yml | 34 ++++--------------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index e6f25a9..55e59cb 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -27,10 +27,6 @@ jobs: uses: actions/setup-python@main with: python-version: ${{ matrix.python-version }} - # You can test your matrix by printing the current Python version - - - name: Display Python version - run: python -c "import sys; print(sys.version)" - name: Install dependencies run: | @@ -38,11 +34,10 @@ jobs: python -m pip install pytest pytest-cov coverage-badge . - name: Test with pytest and coverage badge - if: matrix.python-version != '3.12' run: | pytest --cov=paint - coverage-badge -fo coverage.svg coverage report -m --format markdown > cov_report.txt + coverage xml - name: Post coverage report to PR if: matrix.python-version == '3.11' @@ -50,28 +45,7 @@ jobs: with: path: cov_report.txt - - name: Tests with pytest and no badge - if: matrix.python-version == '3.12' - run: | - pytest --cov=paint - - - name: Verify Changed files - uses: tj-actions/verify-changed-files@v19 - id: verify-changed-files - with: - files: coverage.svg - - - name: Commit files - if: steps.verify-changed-files.outputs.files_changed == 'true' && matrix.python-version == '3.11' - run: | - git config --local user.email "github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git add coverage.svg - git commit -m "Updated coverage.svg" - - - name: Push changes - if: steps.verify-changed-files.outputs.files_changed == 'true' && matrix.python-version == '3.11' - uses: ad-m/github-push-action@master + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v4.0.1 with: - github_token: ${{ secrets.github_token }} - branch: ${{ github.head_ref }} + token: ${{ secrets.CODECOV_TOKEN }} From fc77bf0d041212e232dfc6e013fd7cec8e9c6907 Mon Sep 17 00:00:00 2001 From: Marie Weiel Date: Tue, 8 Oct 2024 18:21:21 +0200 Subject: [PATCH 5/6] remove outdated coverage badge --- coverage.svg | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 coverage.svg diff --git a/coverage.svg b/coverage.svg deleted file mode 100644 index 0fa9649..0000000 --- a/coverage.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - coverage - coverage - 98% - 98% - - From 4ae6f8952ec5cf9ab5dda4728ad415fc8e54a32a Mon Sep 17 00:00:00 2001 From: Marie Weiel Date: Tue, 8 Oct 2024 18:25:39 +0200 Subject: [PATCH 6/6] update license of database --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index c3f9d36..3ebd1af 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -78,4 +78,4 @@ keywords: - Deflectometry - Surface Reconstruction - Benchmark -license: MIT +license: CDLA 2.0