Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
# Various general + format-specific helpers
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-symlinks
- id: trailing-whitespace
Expand All @@ -18,12 +18,12 @@ repos:
- id: check-added-large-files
args: [--maxkb=10000]
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: '0.29.0'
rev: '0.31.2'
hooks:
- id: check-github-workflows
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.5.4
rev: v0.9.9
hooks:
# Run the linter.
- id: ruff
Expand All @@ -33,7 +33,7 @@ repos:
- id: ruff-format
types_or: [python, pyi, jupyter]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v1.11.0'
rev: 'v1.15.0'
hooks:
- id: mypy
args: [--no-strict-optional, --ignore-missing-imports]
Expand All @@ -46,7 +46,7 @@ repos:
hooks:
- id: validate-cff
- repo: https://github.com/fsfe/reuse-tool
rev: 'v4.0.3'
rev: 'v5.0.2'
hooks:
- id: reuse

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-hooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
entry: somesy
args: ["sync"]
language: python
files: '^somesy\.toml|\.somesy\.toml|pyproject\.toml|package\.json$'
files: '^somesy\.toml|\.somesy\.toml|pyproject\.toml|package\.json|Project\.toml|cargo\.toml|fpm\.toml$'
pass_filenames: false
12 changes: 0 additions & 12 deletions .reuse/dep5

This file was deleted.

2 changes: 1 addition & 1 deletion .somesy.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "somesy"
version = "0.7.0"
version = "0.7.1"
description = "A CLI tool for synchronizing software project metadata."
keywords = ["metadata", "FAIR"]
license = "MIT"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Here we provide notes that summarize the most important changes in each released

Please consult the changelog to inform yourself about breaking changes and security issues.

## [v0.7.1](https://github.com/Materials-Data-Science-and-Informatics/somesy/tree/v0.7.1) <small>(2025-03-07)</small> { id="0.7.1" }

- fix poetry v2 license format and urls format problem

## [v0.7.0](https://github.com/Materials-Data-Science-and-Informatics/somesy/tree/v0.7.0) <small>(2025-03-04)</small> { id="0.7.0" }

- make validation of output files, such as pyproject.toml, optional
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ type: software
message: If you use this software, please cite it using this metadata.

title: somesy
version: 0.7.0
version: 0.7.1
abstract: A CLI tool for synchronizing software project metadata.
url: https://materials-data-science-and-informatics.github.io/somesy
repository-code: https://github.com/Materials-Data-Science-and-Informatics/somesy
Expand Down
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ file in the root folder of your repository:
repos:
# ... (your other hooks) ...
- repo: https://github.com/Materials-Data-Science-and-Informatics/somesy
rev: 'v0.7.0'
rev: 'v0.7.1'
hooks:
- id: somesy
```
Expand All @@ -197,22 +197,22 @@ so when using `somesy` with pre-commit, keep in mind that

Here is an overview of all the currently supported files and formats.

| Input Formats | Status | | Target Formats | Status |
| -------------- | ------ | --- | ----------------------------------- | ------ |
| (.)somesy.toml | ✓ | | pyproject.toml _(poetry v1 and v2)_ | ✓ |
| pyproject.toml | ✓ | | pyproject.toml _(setuptools)_ | ✓(1.) |
| package.json | ✓ | | package.json _(JavaScript)_ | ✓(2.) |
| Project.toml | ✓ | | Project.toml _(Julia)_ | ✓ |
| fpm.toml | ✓ | | fpm.toml _(Fortran)_ | ✓(3.) |
| | ✓ | | pom.toml _(Java)_ | ✓(4.) |
| Cargo.toml | ✓ | | Cargo.toml _(Rust)_ | ✓ |
| | | | mkdocs.yml | ✓(5.) |
| | | | CITATION.cff | ✓ |
| | | | codemeta.json | ✓(6.) |
| Input Formats | Status | | Target Formats | Status |
| -------------- | ------ | --- | ---------------------------------------- | ------ |
| (.)somesy.toml | ✓ | | - | ✓ |
| pyproject.toml | ✓ | | pyproject.toml _(setuptools and poetry)_ | ✓(1.) |
| package.json | ✓ | | package.json _(JavaScript)_ | ✓(2.) |
| Project.toml | ✓ | | Project.toml _(Julia)_ | ✓ |
| fpm.toml | ✓ | | fpm.toml _(Fortran)_ | ✓(3.) |
| | ✓ | | pom.toml _(Java)_ | ✓(4.) |
| Cargo.toml | ✓ | | Cargo.toml _(Rust)_ | ✓ |
| | | | mkdocs.yml | ✓(5.) |
| | | | CITATION.cff | ✓ |
| | | | codemeta.json | ✓(6.) |

**Notes:**

1. note that `somesy` does not support setuptools _dynamic fields_
1. note that `somesy` does not support setuptools or poetry _dynamic fields_
2. `package.json` only supports one author, so `somesy` will pick the _first_ listed author
3. `fpm.toml` only supports one author and maintainer, so `somesy` will pick the _first_ listed author and maintainer
4. `pom.xml` has no concept of `maintainers`, but it can have multiple licenses (somesy only supports one main project license)
Expand Down
16 changes: 16 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version = 1
SPDX-PackageName = "somesy"
SPDX-PackageSupplier = "Mustafa Soylu <m.soylu@fz-juelich.de>"
SPDX-PackageDownloadLocation = "https://github.com/Materials-Data-Science-and-Informatics/somesy"

[[annotations]]
path = [".gitignore", "pyproject.toml", "poetry.lock", ".pre-commit-config.yaml", ".pre-commit-hooks.yaml", ".sourcery.yaml", ".somesy.toml", "codemeta.json", "CITATION.cff", "README.md", "RELEASE_NOTES.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "AUTHORS.md", "CONTRIBUTING.md", ".gitlab-ci.yml", ".gitlab/**", ".github/**", "mkdocs.yml", "docs/**"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2023 Forschungszentrum Jülich GmbH - Institute Materials Data Science and Informatics (IAS9) - Stefan Sandfeld (s.sandfeld@fz-juelich.de)"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = ["src/somesy/**", "tests/**"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2023 Forschungszentrum Jülich GmbH - Institute Materials Data Science and Informatics (IAS9) - Stefan Sandfeld (s.sandfeld@fz-juelich.de)"
SPDX-License-Identifier = "MIT"
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
],
"name": "somesy",
"description": "A CLI tool for synchronizing software project metadata.",
"version": "0.7.0",
"version": "0.7.1",
"keywords": [
"metadata",
"FAIR"
Expand Down
2 changes: 1 addition & 1 deletion docs/dev_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Here is a *non-exhaustive* list of the most important files and directories in t
* `codemeta.json`: metadata for harvesting by other tools and services
* `LICENSE`: the (main) license of the project
* `LICENSES`: copies of all licenses that apply to files in the project
* `.reuse/dep5`: granular license and copyright information for all files and directories
* `REUSE.toml`: granular license and copyright information for all files and directories

*Development:*

Expand Down
4 changes: 2 additions & 2 deletions docs/license.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Unless stated otherwise, all code provided by this project
This project is [REUSE](https://reuse.software/) compliant.
The following detailed license and copyright information in
[DEP5](https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/)
format can also be found in the `.reuse/dep5` file in the project source directory:
format can also be found in the `REUSE.toml` file in the project source directory:

```
--8<-- ".reuse/dep5"
--8<-- "REUSE.toml"
```
Loading
Loading