Skip to content

Commit d96bc94

Browse files
authored
Merge pull request #116 from Materials-Data-Science-and-Informatics/fix/poetry-license
Fix/poetry license
2 parents 8109696 + 3919395 commit d96bc94

16 files changed

Lines changed: 356 additions & 120 deletions

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
# Various general + format-specific helpers
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v4.6.0
4+
rev: v5.0.0
55
hooks:
66
- id: check-symlinks
77
- id: trailing-whitespace
@@ -18,12 +18,12 @@ repos:
1818
- id: check-added-large-files
1919
args: [--maxkb=10000]
2020
- repo: https://github.com/python-jsonschema/check-jsonschema
21-
rev: '0.29.0'
21+
rev: '0.31.2'
2222
hooks:
2323
- id: check-github-workflows
2424
- repo: https://github.com/astral-sh/ruff-pre-commit
2525
# Ruff version.
26-
rev: v0.5.4
26+
rev: v0.9.9
2727
hooks:
2828
# Run the linter.
2929
- id: ruff
@@ -33,7 +33,7 @@ repos:
3333
- id: ruff-format
3434
types_or: [python, pyi, jupyter]
3535
- repo: https://github.com/pre-commit/mirrors-mypy
36-
rev: 'v1.11.0'
36+
rev: 'v1.15.0'
3737
hooks:
3838
- id: mypy
3939
args: [--no-strict-optional, --ignore-missing-imports]
@@ -46,7 +46,7 @@ repos:
4646
hooks:
4747
- id: validate-cff
4848
- repo: https://github.com/fsfe/reuse-tool
49-
rev: 'v4.0.3'
49+
rev: 'v5.0.2'
5050
hooks:
5151
- id: reuse
5252

.pre-commit-hooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
entry: somesy
55
args: ["sync"]
66
language: python
7-
files: '^somesy\.toml|\.somesy\.toml|pyproject\.toml|package\.json$'
7+
files: '^somesy\.toml|\.somesy\.toml|pyproject\.toml|package\.json|Project\.toml|cargo\.toml|fpm\.toml$'
88
pass_filenames: false

.reuse/dep5

Lines changed: 0 additions & 12 deletions
This file was deleted.

.somesy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "somesy"
3-
version = "0.7.0"
3+
version = "0.7.1"
44
description = "A CLI tool for synchronizing software project metadata."
55
keywords = ["metadata", "FAIR"]
66
license = "MIT"

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Here we provide notes that summarize the most important changes in each released
44

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

7+
## [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" }
8+
9+
- fix poetry v2 license format and urls format problem
10+
711
## [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" }
812

913
- make validation of output files, such as pyproject.toml, optional

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ type: software
33
message: If you use this software, please cite it using this metadata.
44

55
title: somesy
6-
version: 0.7.0
6+
version: 0.7.1
77
abstract: A CLI tool for synchronizing software project metadata.
88
url: https://materials-data-science-and-informatics.github.io/somesy
99
repository-code: https://github.com/Materials-Data-Science-and-Informatics/somesy

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ file in the root folder of your repository:
176176
repos:
177177
# ... (your other hooks) ...
178178
- repo: https://github.com/Materials-Data-Science-and-Informatics/somesy
179-
rev: 'v0.7.0'
179+
rev: 'v0.7.1'
180180
hooks:
181181
- id: somesy
182182
```
@@ -197,22 +197,22 @@ so when using `somesy` with pre-commit, keep in mind that
197197

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

200-
| Input Formats | Status | | Target Formats | Status |
201-
| -------------- | ------ | --- | ----------------------------------- | ------ |
202-
| (.)somesy.toml | ✓ | | pyproject.toml _(poetry v1 and v2)_ | ✓ |
203-
| pyproject.toml | ✓ | | pyproject.toml _(setuptools)_ | ✓(1.) |
204-
| package.json | ✓ | | package.json _(JavaScript)_ | ✓(2.) |
205-
| Project.toml | ✓ | | Project.toml _(Julia)_ | ✓ |
206-
| fpm.toml | ✓ | | fpm.toml _(Fortran)_ | ✓(3.) |
207-
| | ✓ | | pom.toml _(Java)_ | ✓(4.) |
208-
| Cargo.toml | ✓ | | Cargo.toml _(Rust)_ | ✓ |
209-
| | | | mkdocs.yml | ✓(5.) |
210-
| | | | CITATION.cff | ✓ |
211-
| | | | codemeta.json | ✓(6.) |
200+
| Input Formats | Status | | Target Formats | Status |
201+
| -------------- | ------ | --- | ---------------------------------------- | ------ |
202+
| (.)somesy.toml | ✓ | | - | ✓ |
203+
| pyproject.toml | ✓ | | pyproject.toml _(setuptools and poetry)_ | ✓(1.) |
204+
| package.json | ✓ | | package.json _(JavaScript)_ | ✓(2.) |
205+
| Project.toml | ✓ | | Project.toml _(Julia)_ | ✓ |
206+
| fpm.toml | ✓ | | fpm.toml _(Fortran)_ | ✓(3.) |
207+
| | ✓ | | pom.toml _(Java)_ | ✓(4.) |
208+
| Cargo.toml | ✓ | | Cargo.toml _(Rust)_ | ✓ |
209+
| | | | mkdocs.yml | ✓(5.) |
210+
| | | | CITATION.cff | ✓ |
211+
| | | | codemeta.json | ✓(6.) |
212212

213213
**Notes:**
214214

215-
1. note that `somesy` does not support setuptools _dynamic fields_
215+
1. note that `somesy` does not support setuptools or poetry _dynamic fields_
216216
2. `package.json` only supports one author, so `somesy` will pick the _first_ listed author
217217
3. `fpm.toml` only supports one author and maintainer, so `somesy` will pick the _first_ listed author and maintainer
218218
4. `pom.xml` has no concept of `maintainers`, but it can have multiple licenses (somesy only supports one main project license)

REUSE.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
version = 1
2+
SPDX-PackageName = "somesy"
3+
SPDX-PackageSupplier = "Mustafa Soylu <m.soylu@fz-juelich.de>"
4+
SPDX-PackageDownloadLocation = "https://github.com/Materials-Data-Science-and-Informatics/somesy"
5+
6+
[[annotations]]
7+
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/**"]
8+
precedence = "aggregate"
9+
SPDX-FileCopyrightText = "2023 Forschungszentrum Jülich GmbH - Institute Materials Data Science and Informatics (IAS9) - Stefan Sandfeld (s.sandfeld@fz-juelich.de)"
10+
SPDX-License-Identifier = "CC0-1.0"
11+
12+
[[annotations]]
13+
path = ["src/somesy/**", "tests/**"]
14+
precedence = "aggregate"
15+
SPDX-FileCopyrightText = "2023 Forschungszentrum Jülich GmbH - Institute Materials Data Science and Informatics (IAS9) - Stefan Sandfeld (s.sandfeld@fz-juelich.de)"
16+
SPDX-License-Identifier = "MIT"

codemeta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
],
2828
"name": "somesy",
2929
"description": "A CLI tool for synchronizing software project metadata.",
30-
"version": "0.7.0",
30+
"version": "0.7.1",
3131
"keywords": [
3232
"metadata",
3333
"FAIR"

docs/dev_guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Here is a *non-exhaustive* list of the most important files and directories in t
2323
* `codemeta.json`: metadata for harvesting by other tools and services
2424
* `LICENSE`: the (main) license of the project
2525
* `LICENSES`: copies of all licenses that apply to files in the project
26-
* `.reuse/dep5`: granular license and copyright information for all files and directories
26+
* `REUSE.toml`: granular license and copyright information for all files and directories
2727

2828
*Development:*
2929

0 commit comments

Comments
 (0)