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
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: v8.3.1
_commit: v8.5.0
_src_path: gh:eccenca/cmem-plugin-template
author_mail: cmempy-developer@eccenca.com
author_name: eccenca GmbH
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ jobs:
virtualenvs-in-project: true
installer-parallel: true

- name: Install dynamic versioning plugin
run: |
poetry self add "poetry-dynamic-versioning[plugin]"

- name: mypy
run: |
task check:mypy
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
virtualenvs-in-project: true
installer-parallel: true

- name: Install dynamic versioning plugin
run: |
poetry self add "poetry-dynamic-versioning[plugin]"

- name: Publish Package
env:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ dmypy.json
# Cython debug symbols
cython_debug/

# Claude code specifics
.claude/settings.local.json

# project build plan specific ignores
version.py
co
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
default:
image: docker-registry.eccenca.com/eccenca-python:v3.13.8
image: docker-registry.eccenca.com/eccenca-python:v3.13.13
# all jobs can be interrupted in case a new commit is pushed
interruptible: true
before_script:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/)

## [Unreleased]

### Fixed

- Fix robot.jar vulnerabilities CVE-2026-54512, CVE-2026-54513, CVE-2026-54514, CVE-2026-54515.

### Changed

- Update template to 8.5.0.

## [2.2.5] 2026-03-01

### Fixed
Expand Down
30 changes: 2 additions & 28 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,9 @@ tasks:
cmds:
- mkdir -p {{.DIST_DIR}}/coverage

poetry:check:
internal: true
platforms: [darwin, linux]
summary: |
Check poetry versioning plugin. Currently not under Windows
run: once
preconditions:
- sh: git -C . rev-parse
msg: >
Your newly created project directory needs to be initialized
as a git repository.
- sh: '[[ {{.PDV_VERSION}} > {{.PDV_VERSION_MIN}} ]]'
msg: >
This project needs the poetry-dynamic-versioning
plugin > v{{.PDV_VERSION_MIN}}.

You can install it with the following command:
poetry self add "poetry-dynamic-versioning[plugin]"
vars:
PDV_VERSION_MIN: 0.20
PDV_VERSION:
sh: >
poetry self show --addons poetry-dynamic-versioning --tree
| head -1 | cut -d " " -f 2 | cut -d "." -f 1-2

poetry:install:
desc: Install dependencies managed by Poetry
run: once
deps:
- poetry:check
cmds:
- poetry install

Expand Down Expand Up @@ -162,6 +135,7 @@ tasks:
poetry run trivy fs
--include-dev-deps
--scanners vuln
--skip-files .poetry/plugins/poetry.lock
--exit-code 1
.
- >
Expand Down Expand Up @@ -194,7 +168,7 @@ tasks:
<<: *preparation
deps:
- clean
- poetry:check
cmds:
- poetry build
- poetry export --without=dev -f requirements.txt >dist/requirements.txt

Binary file modified cmem_plugin_reason/robot.jar
Binary file not shown.
2,140 changes: 1,261 additions & 879 deletions poetry.lock

Large diffs are not rendered by default.

23 changes: 14 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,38 @@ keywords = [
]
homepage = "https://github.com/eccenca/cmem-plugin-reason"

[tool.poetry.requires-plugins]
poetry-plugin-export = "^1.10.0"
poetry-plugin-shell = "^1.0.1"
poetry-dynamic-versioning = "^1.10.0"

[tool.poetry.dependencies]# if you need to change python version here, change it also in .python-version
python = "^3.13"
validators = "^0.35.0"
pathvalidate = "^3.3.1"
inflection = "^0.5.1"
defusedxml = "^0.7.1"
cmem-cmempy = "^25.4.0"
cmem-cmempy = "^25.5.0"

[tool.poetry.dependencies.cmem-plugin-base]
version = "^4.12.1"
version = "^4.16.1"
allow-prereleases = false

[tool.poetry.group.dev.dependencies.cmem-cmemc]
version = ">=24.2.0"

[tool.poetry.group.dev.dependencies]
deptry = "^0.24.0"
deptry = "^0.25.1"
genbadge = {extras = ["coverage"], version = "^1.1.3"}
mypy = "^1.19.1"
mypy = "^2.1.0"
pip = "^26"
pytest = "^9.0.2"
pytest-cov = "^7.0.0"
pytest = "^9.1.0"
pytest-cov = "^7.1.0"
pytest-dotenv = "^0.5.2"
pytest-html = "^4.2.0"
pytest-memray = { version = "^1.8.0", markers = "platform_system != 'Windows'" }
ruff = "^0.15.0"
trivy-py-ecc = "^0.68.2.1"
ruff = "^0.15.17"
trivy-py-ecc = "^0.71.2.1"

[build-system]
requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning"]
Expand Down Expand Up @@ -72,7 +77,7 @@ exclude_also = [

[tool.ruff]
line-length = 100
target-version = "py311"
target-version = "py313"

[tool.ruff.format]
line-ending = "lf" # Use `\n` line endings for all files
Expand Down
2 changes: 1 addition & 1 deletion tests/test_reason.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def reasoner_parameter() -> str | None:


@pytest.fixture
def setup() -> Generator[None, Any, None]:
def setup() -> Generator[None, Any]:
"""Set up Reason test"""
delete(REASON_RESULT_GRAPH_IRI)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def reasoner_parameter() -> str | None:


@pytest.fixture
def setup() -> Generator[None, Any, None]:
def setup() -> Generator[None, Any]:
"""Set up Validate test"""
with suppress(Exception):
delete_project(PROJECT_ID)
Expand Down
Loading