Skip to content

Commit

Permalink
manual merge
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-jettka committed Nov 28, 2024
2 parents 9059910 + 1c1514f commit f5e1ddc
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 38 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/fair-software.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ jobs:
name: "fair-software"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ftr/113-improve-citability
- uses: fair-software/[email protected]
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 }}"
- uses: fair-software/[email protected]
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 }}"
1 change: 1 addition & 0 deletions .howfairis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
skip_registry_checks_reason : "registered in NFDI4Culture Registry for Tools & Services at https://nfdi4culture.de/id/E3648"
31 changes: 11 additions & 20 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,29 @@ message: >-
metadata from this file.
type: software
authors:
- given-names: Benjamin W.
family-names: Bohl
- given-names: Daniel
family-names: Röwenstrunk
- given-names: Nikolaos
family-names: Beer
- given-names: Dennis
family-names: Ried
- given-names: Peter
family-names: Stadler
- given-names: Benjamin W.
family-names: Bohl
- given-names: Nikolaos
family-names: Beer
- given-names: Kristin
family-names: Herold
- given-names: Daniel
family-names: Jettka
- given-names: Johannes
family-names: Kepper
- given-names: Anna Maria
family-names: Neubert
- given-names: Dennis
family-names: Friedl
- given-names: Stefan
family-names: Münnich
- given-names: Elena
family-names: Schilke
- given-names: Dennis
family-names: Ried
- given-names: Dennis
family-names: Friedl
- given-names: Hizkiel
family-names: Alemayehu
- given-names: Salome
family-names: Obert
identifiers:
- type: doi
value: 10.5281/zenodo.7472503
value: 10.5281/zenodo.5347861
description: Edirom Online
repository-code: 'https://github.com/Edirom/Edirom-Online'
abstract: >-
Expand All @@ -54,6 +46,5 @@ abstract: >-
music and adding audio and even film within a single
edition.
license: GPL-3.0
commit: e5ec44251aefcea3c74c9226aa0b5be64e1c88f9
version: v1.0.0-beta.5
date-released: '2022-12-22'
version: v1.0.0
date-released: '2024-11-20'
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<div align="center">

[![Build](https://github.com/Edirom/Edirom-Online/actions/workflows/pre-release.yml/badge.svg?branch=develop&event=push)](https://github.com/Edirom/Edirom-Online/actions/workflows/pre-release.yml)
[![GitHub release](https://img.shields.io/github/v/release/Edirom/Edirom-Online.svg)](https://github.com/Edirom/Edirom-Online/releases)
[![GitHub license](https://img.shields.io/github/license/Edirom/Edirom-Online.svg)](https://github.com/Edirom/Edirom-Online/blob/main/LICENSE)

[![Build](https://github.com/Edirom/Edirom-Online/actions/workflows/pre-release.yml/badge.svg?branch=develop&event=push)](https://github.com/Edirom/Edirom-Online/actions/workflows/pre-release.yml)
[![NFDI4C Registry](https://nfdi4culture.de/fileadmin/user_upload/registry/badges/nfdi4culturebadge.svg)](https://nfdi4culture.de/id/E3648)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
[![FAIR checklist badge](https://fairsoftwarechecklist.net/badge.svg)](https://fairsoftwarechecklist.net/v0.2?f=31&a=32113&i=32300&r=133)
[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B48617%2Fgithub.com%2FEdirom%2FEdirom-Online.svg?type=small)](https://app.fossa.com/projects/custom%2B48617%2Fgithub.com%2FEdirom%2FEdirom-Online?ref=badge_small)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5347861.svg)](https://doi.org/10.5281/zenodo.7472503)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
[![GitHub release](https://img.shields.io/github/v/release/Edirom/Edirom-Online.svg)](https://github.com/Edirom/Edirom-Online/releases)
[![FAIR checklist badge](https://fairsoftwarechecklist.net/badge.svg)](https://fairsoftwarechecklist.net/v0.2?f=31&a=32113&i=32300&r=133)
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9746/badge)](https://www.bestpractices.dev/projects/9746)
[![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%8B%20%20%E2%97%8B-orange)](https://fair-software.eu)
[![DOI](https://zenodo.org/badge/5966814.svg)](https://zenodo.org/badge/latestdoi/5966814)

</div>

<hr/>

<div align="center">

Expand Down

0 comments on commit f5e1ddc

Please sign in to comment.