Skip to content

Commit e54f779

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents 38bd0bc + d8b9d27 commit e54f779

22 files changed

Lines changed: 1203 additions & 1241 deletions

File tree

.github/workflows/testing.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ env:
3939
FORCE_COLOR: "1" # Force color output in CI
4040

4141
jobs:
42-
# Verifies pep8, pyflakes and circular complexity
43-
flake8:
44-
name: 🚨 Lint Python Code
42+
# Verifies pep8, pyflakes, circular complexity, and spelling
43+
lint:
44+
name: 🚨 Lint and spellcheck
4545
runs-on: ubuntu-latest
4646
steps:
4747
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -53,14 +53,16 @@ jobs:
5353
python-version: ${{ env.PYTHON_VERSION }}
5454
- name: 🔽 Install flake8
5555
run: pip install flake8
56-
- name: Run checks
56+
- name: Lint Python code
5757
run: flake8 -v rocrate_validator tests
58+
- name: ⌛ Spell check code and profiles (covers Python and SHACL)
59+
uses: crate-ci/typos@v1.41.0
5860

5961
# Runs the tests
6062
test:
6163
name: ⌛ Run tests
6264
runs-on: ubuntu-latest
63-
needs: [flake8]
65+
needs: [lint]
6466
steps:
6567
- name: ⬇️ Checkout
6668
uses: actions/checkout@v4

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ docs/_build
2727
**/.coverage
2828
**/.coverage.*
2929
**/.report
30+
31+
# ignore IDE files
32+
.vscode/
33+
.idea/

CITATION.cff

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
cff-version: 1.2.0
2+
message: "If you use this software, please cite it using these metadata."
3+
title: "rocrate-validator"
4+
abstract: "A Python package to validate RO-Crates."
5+
type: software
6+
authors:
7+
- family-names: "Piras"
8+
given-names: "Marco Enrico"
9+
orcid: https://orcid.org/0000-0002-5207-0030
10+
- family-names: "Leo"
11+
given-names: "Simone"
12+
orcid: https://orcid.org/0000-0001-8271-5429
13+
- family-names: "Pireddu"
14+
given-names: "Luca"
15+
orcid: https://orcid.org/0000-0002-4663-5613
16+
- family-names: Chadwick
17+
given-names: Eli
18+
orcid: https://orcid.org/0000-0002-0035-6475
19+
- family-names: Bauer
20+
given-names: Daniel
21+
orcid: https://orcid.org/0000-0001-9447-460X
22+
repository-code: "https://github.com/crs4/rocrate-validator"
23+
url: "https://github.com/crs4/rocrate-validator"
24+
keywords:
25+
- "RO-Crate"
26+
- "validation"
27+
- "metadata"
28+
- "FAIR"
29+
license: "Apache-2.0"

poetry.lock

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

pyproject.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ requests = ">=2.32,<3.0"
7070
requests-cache = ">=1.2,<2.0"
7171
inquirerpy = ">=0.3.4,<0.4.0"
7272
enum-tools = ">=0.12,<0.13"
73+
typos = "^1.41.0"
7374

7475
[tool.poetry.group.dev.dependencies]
7576
pyproject-flake8 = "^6.1.0"
@@ -105,3 +106,6 @@ skip_dirs = [".git", ".github", ".vscode"]
105106

106107
[tool.pytest.ini_options]
107108
testpaths = ["tests"]
109+
110+
[tool.typos.files]
111+
extend-exclude = ["tests/data","docs/diagrams","*.json","*.html","*__init__.py"]

rocrate_validator/profiles/process-run-crate/profile.ttl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
# it's in JSON-LD format
4545
dct:format <https://w3id.org/mediatype/application/ld+json> ;
4646

47-
# it conforms to JSON-LD, here refered to by its namespace URI as a Profile
47+
# it conforms to JSON-LD, here referred to by its namespace URI as a Profile
4848
dct:conformsTo <https://www.w3.org/TR/json-ld11/> ;
4949

5050
# this profile resource plays the role of "Vocabulary"
@@ -62,7 +62,7 @@
6262
# it's in HTML format
6363
dct:format <https://w3id.org/mediatype/text/html> ;
6464

65-
# it conforms to HTML, here refered to by its namespace URI as a Profile
65+
# it conforms to HTML, here referred to by its namespace URI as a Profile
6666
dct:conformsTo <https://www.w3.org/TR/html/> ;
6767

6868
# this profile resource plays the role of "Specification"

rocrate_validator/profiles/provenance-run-crate/profile.ttl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# it's in JSON-LD format
4646
dct:format <https://w3id.org/mediatype/application/ld+json> ;
4747

48-
# it conforms to JSON-LD, here refered to by its namespace URI as a Profile
48+
# it conforms to JSON-LD, here referred to by its namespace URI as a Profile
4949
dct:conformsTo <https://www.w3.org/TR/json-ld11/> ;
5050

5151
# this profile resource plays the role of "Vocabulary"
@@ -63,7 +63,7 @@
6363
# it's in HTML format
6464
dct:format <https://w3id.org/mediatype/text/html> ;
6565

66-
# it conforms to HTML, here refered to by its namespace URI as a Profile
66+
# it conforms to HTML, here referred to by its namespace URI as a Profile
6767
dct:conformsTo <https://www.w3.org/TR/html/> ;
6868

6969
# this profile resource plays the role of "Specification"

rocrate_validator/profiles/provenance-run-crate/should/5_parameterconnection.ttl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ provenance-run-crate:ProvRCParameterConnectionReferencesRecommended a sh:NodeSha
2929
sh:description "Recommended references for ParameterConnection entities" ;
3030
sh:targetClass wfrun:ParameterConnection ;
3131
sh:property [
32-
sh:name "ParamenterConnection references" ;
32+
sh:name "ParameterConnection references" ;
3333
sh:description """References to `ParameterConnection` instances
3434
SHOULD follow the CWL convention,
3535
where connections to workflow output parameters are referenced by the workflow

rocrate_validator/profiles/ro-crate/may/4_data_entity_metadata.ttl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ro-crate:FileDataEntityWebOptionalProperties a sh:NodeShape ;
2727
for instance a landing page that describes the file, including persistence identifiers (e.g. DOI),
2828
resolving to an intermediate HTML page instead of the downloadable file directly.
2929
These can included for File Data Entities as additional metadata by using the properties:
30-
`ìdentifier`, `url`, `subjectOf`and `mainEntityOfPage`""" ;
30+
`identifier`, `url`, `subjectOf`and `mainEntityOfPage`""" ;
3131
sh:targetClass ro-crate:File ;
3232
# Check if the Web-based Data Entity has a contentSize property
3333
sh:property [
@@ -87,4 +87,3 @@ ro-crate:DirectoryDataEntityWebOptionalDistribution a sh:NodeShape ;
8787
sh:severity sh:Info ;
8888
sh:message """The Directory Data Entity MAY have a `distribution` property to denote the distribution of the files within the directory""" ;
8989
] .
90-

rocrate_validator/profiles/ro-crate/must/2_root_data_entity_metadata.ttl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ ro-crate:RootDataEntityRequiredProperties
129129
] ;
130130
sh:property [
131131
a sh:PropertyShape ;
132-
sh:name "Root Data Entity: `licence` property" ;
132+
sh:name "Root Data Entity: `license` property" ;
133133
sh:description """Check if the Root Data Entity includes a `license` property (as specified by schema.org)
134134
to provide information about the license of the dataset.""" ;
135135
sh:path schema_org:license;

0 commit comments

Comments
 (0)