Skip to content

Commit a3d9c84

Browse files
authored
Merge pull request #12 from eccenca/feature/updateDependencies
update dependencies (esp. rdflib7 via cmempy)
2 parents c4fdf88 + 7517ef6 commit a3d9c84

File tree

10 files changed

+577
-570
lines changed

10 files changed

+577
-570
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: v7.1.0
2+
_commit: v7.2.0-4-g738b107
33
_src_path: gh:eccenca/cmem-plugin-template
44
author_mail: [email protected]
55
author_name: eccenca GmbH

.github/workflows/check.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ jobs:
5757
run: |
5858
task check:pytest
5959
60+
- name: deptry
61+
run: |
62+
task check:deptry
63+
6064
- name: safety
6165
run: |
6266
task check:safety

.gitlab-ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ pytest:
5858
- dist/coverage
5959
- dist/coverage.xml
6060

61+
deptry:
62+
stage: test
63+
script:
64+
- task check:deptry
65+
6166
safety:
6267
stage: test
6368
script:

README-public.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Generate SHACL shapes from an instance data graph.
44

55
[![eccenca Corporate Memory][cmem-shield]][cmem-link]
66

7-
8-
You can install it with the [cmemc](https://eccenca.com/go/cmemc) command line clients with:
7+
This is a plugin for [eccenca](https://eccenca.com) [Corporate Memory](https://documentation.eccenca.com). You can install it with the [cmemc](https://eccenca.com/go/cmemc) command line client like this:
98

109
```
1110
cmemc admin workspace python install cmem-plugin-shapes
@@ -27,4 +26,3 @@ cmemc admin workspace python install cmem-plugin-shapes
2726
[copier]: https://copier.readthedocs.io/
2827
[copier-shield]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/copier-org/copier/master/img/badge/badge-grayscale-inverted-border-purple.json
2928

30-

Taskfile.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ tasks:
6868
| head -1 | cut -d " " -f 2 | cut -d "." -f 1-2
6969
7070
poetry:install:
71-
internal: true
7271
desc: Install dependencies managed by Poetry
7372
run: once
7473
deps:
@@ -110,6 +109,7 @@ tasks:
110109
cmds:
111110
- task: check:ruff
112111
- task: check:mypy
112+
- task: check:deptry
113113
- task: check:safety
114114

115115
check:pytest:
@@ -159,6 +159,12 @@ tasks:
159159
# ignore 51358 safety - dev dependency only
160160
- poetry run safety check -i 51358
161161

162+
check:deptry:
163+
desc: Complain about unused or missing dependencies
164+
<<: *preparation
165+
cmds:
166+
- poetry run deptry .
167+
162168
check:ruff:
163169
desc: Complain about everything else
164170
<<: *preparation

poetry.lock

Lines changed: 544 additions & 478 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "cmem-plugin-shapes"
3-
version = "2.0.2.dev5+3aef0ea.dirty"
3+
version = "0.0.0"
44
license = "Apache-2.0"
55
description = "Generate SHACL shapes from an instance data graph."
66
authors = ["eccenca GmbH <[email protected]>"]
@@ -17,25 +17,27 @@ homepage = "https://github.com/eccenca/cmem-plugin-shapes"
1717
[tool.poetry.dependencies]# if you need to change python version here, change it also in .python-version
1818
python = "^3.11"
1919
validators = "^0.34.0"
20-
rdflib = "^6.3.2"
20+
rdflib = "^7.1.4"
21+
cmem-cmempy = "^25"
2122

2223
[tool.poetry.dependencies.cmem-plugin-base]
23-
version = "^4.5.0"
24+
version = "^4.11.0"
2425
allow-prereleases = false
2526

2627
[tool.poetry.group.dev.dependencies.cmem-cmemc]
27-
version = "^24.3.0"
28+
version = "^25.3.0"
2829

2930
[tool.poetry.group.dev.dependencies]
30-
genbadge = {extras = ["coverage"], version = "^1.1.1"}
31-
mypy = "^1.14.1"
32-
pip = "^25.0"
33-
pytest = "^8.3.4"
34-
pytest-cov = "^6.0.0"
31+
deptry = "^0.23.0"
32+
genbadge = {extras = ["coverage"], version = "^1.1.2"}
33+
mypy = "^1.16.1"
34+
pip = "^25.1.1"
35+
pytest = "^8.4.1"
36+
pytest-cov = "^6.2.1"
3537
pytest-dotenv = "^0.5.2"
3638
pytest-html = "^4.1.1"
3739
pytest-memray = { version = "^1.7.0", markers = "platform_system != 'Windows'" }
38-
ruff = "^0.9.4"
40+
ruff = "^0.12.0"
3941
safety = "^1.10.3"
4042

4143
[build-system]

tests/cmemc_command_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import time
44

5-
import cmem_cmemc
65
from click.testing import CliRunner, Result
6+
from cmem_cmemc.cli import cli
77

88
CLI_RUNNER = CliRunner()
99

@@ -39,7 +39,7 @@ def __init__(self, result: Result):
3939
def _run(command: tuple[str, ...] | list[str]) -> AnnotatedResult:
4040
"""Wrap the CliRunner"""
4141
t_start = time.time()
42-
result = CLI_RUNNER.invoke(cmem_cmemc.cli, command)
42+
result = CLI_RUNNER.invoke(cli, command)
4343
t_end = time.time()
4444
annotated_result = AnnotatedResult(result=result)
4545
annotated_result.t_start = t_start

tests/test_shapes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from cmem.cmempy.dp.proxy.graph import get
1313
from cmem.cmempy.dp.proxy.sparql import get as sparql_get
1414
from cmem.cmempy.dp.proxy.update import post
15+
from cmem_plugin_base.testing import TestExecutionContext
1516
from rdflib import DCTERMS, Graph, URIRef
1617
from rdflib.compare import isomorphic
1718

@@ -23,7 +24,6 @@
2324
)
2425
from tests import FIXTURE_DIR
2526
from tests.cmemc_command_utils import run, run_without_assertion
26-
from tests.utils import TestExecutionContext
2727

2828
DATETIME_PATTERN = re.compile(
2929
r'^"[1-9][0-9]{3}-[0-1][1-9]-[0-3][0-9]T[0-2][0-9]:[0-5][0-9]:[0-5][0-9].[0-9]{3}Z"\^\^'

tests/utils.py

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

0 commit comments

Comments
 (0)