Skip to content

Commit c9691e9

Browse files
EttoreMEttoreM
authored
Merge pull request #127 from eScienceLab/upstream-develop
Bring in changes from upstream v0.11.2
2 parents 68a6a3b + e9005b3 commit c9691e9

605 files changed

Lines changed: 31834 additions & 9455 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cspell.json‎

Lines changed: 248 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,248 @@
1+
{
2+
"version": "0.2",
3+
"language": "en,en-GB",
4+
"allowCompoundWords": true,
5+
"words": [
6+
"abfs",
7+
"abfss",
8+
"arcp",
9+
"autoenum",
10+
"bagit",
11+
"bioschemas",
12+
"bnode",
13+
"bysource",
14+
"camelcase",
15+
"conformsTo",
16+
"crate",
17+
"crs",
18+
"cwltool",
19+
"dav",
20+
"davs",
21+
"dedup",
22+
"dedups",
23+
"eocd",
24+
"exampleofwork",
25+
"fmap",
26+
"focusNode",
27+
"ftps",
28+
"furb",
29+
"getattr",
30+
"getch",
31+
"getinfo",
32+
"hasToken",
33+
"hdfs",
34+
"hier",
35+
"howtostep",
36+
"inquirerpy",
37+
"ipynb",
38+
"irods",
39+
"isort",
40+
"isProfileOf",
41+
"isTransitiveProfileOf",
42+
"iter",
43+
"ivar",
44+
"jsonld",
45+
"kibibyte",
46+
"kikkomep",
47+
"linkml",
48+
"luca",
49+
"mainEntity",
50+
"mccabe",
51+
"metavar",
52+
"mypy",
53+
"myst",
54+
"nbsphinx",
55+
"nocheck",
56+
"noqa",
57+
"openapi",
58+
"owlrl",
59+
"partx",
60+
"pfzy",
61+
"piras",
62+
"pireddu",
63+
"pireddur",
64+
"procrc",
65+
"prof",
66+
"provrc",
67+
"pycache",
68+
"pycheck",
69+
"pydocstyle",
70+
"pygments",
71+
"pylint",
72+
"pypi",
73+
"pyproject",
74+
"pyshacl",
75+
"pytest",
76+
"pytypes",
77+
"pyupgrade",
78+
"pyvenv",
79+
"rdflib",
80+
"rdfs",
81+
"readthedocs",
82+
"redef",
83+
"regconfig",
84+
"resultMessage",
85+
"resultPath",
86+
"resultSeverity",
87+
"rgxs",
88+
"roc",
89+
"rocr",
90+
"rocrate",
91+
"rocv",
92+
"rsync",
93+
"rtype",
94+
"scp",
95+
"sftp",
96+
"shacl",
97+
"shoulds",
98+
"simleo",
99+
"skos",
100+
"sourceConstraintComponent",
101+
"sourceShape",
102+
"sparql",
103+
"sqlite",
104+
"sssom",
105+
"subclassof",
106+
"subcls",
107+
"tcgetattr",
108+
"tcsadrain",
109+
"tcsetattr",
110+
"tldr",
111+
"tmpdirname",
112+
"toctree",
113+
"trig",
114+
"uncheckable",
115+
"validator",
116+
"venv",
117+
"violatingEntity",
118+
"violatingProperty",
119+
"violatingPropertyValue",
120+
"virtualenv",
121+
"virtualenvs",
122+
"wasb",
123+
"wasbs",
124+
"wfrc",
125+
"wroc",
126+
"wrroc",
127+
"wtroc",
128+
"xone",
129+
"zenodo"
130+
],
131+
"ignoreWords": [
132+
"AggregatedValidationStatistics",
133+
"AvailabilityStatus",
134+
"BadSyntaxError",
135+
"BaseOutputFormatter",
136+
"CheckIssue",
137+
"CheckValidationError",
138+
"CustomEncoder",
139+
"DuplicateRequirement",
140+
"DuplicateRequirementCheck",
141+
"HttpRequester",
142+
"InvalidProfilePath",
143+
"InvalidSerializationFormat",
144+
"JSONOutputFormatter",
145+
"LevelCollection",
146+
"LiveTextProgressLayout",
147+
"LoggerProxy",
148+
"MapIndex",
149+
"MultiIndexMap",
150+
"NodeShape",
151+
"OfflineCacheMissError",
152+
"OfflineFallbackSession",
153+
"OutputFormatter",
154+
"ProfileSpecificationError",
155+
"ProfileSpecificationNotFound",
156+
"ProfilesDirectoryNotFound",
157+
"PropertyGroup",
158+
"PropertyShape",
159+
"PyFunctionCheck",
160+
"PyRequirement",
161+
"PyRequirementLoader",
162+
"ROCrate",
163+
"ROCrateBagitLocalFolder",
164+
"ROCrateBagitLocalZip",
165+
"ROCrateBagitRemoteZip",
166+
"ROCrateEntity",
167+
"ROCrateInvalidURIError",
168+
"ROCrateLocalFolder",
169+
"ROCrateLocalZip",
170+
"ROCrateMetadata",
171+
"ROCrateMetadataNotFoundError",
172+
"ROCrateRemoteZip",
173+
"ROCValidator",
174+
"ROCValidatorError",
175+
"RequirementCheck",
176+
"RequirementCheckValidationEvent",
177+
"RequirementLevel",
178+
"RequirementLoader",
179+
"RequirementValidationEvent",
180+
"SHACLCheck",
181+
"SHACLNode",
182+
"SHACLNodeCollection",
183+
"SHACLRequirement",
184+
"SHACLRequirementLoader",
185+
"SHACLValidationAlreadyProcessed",
186+
"SHACLValidationContext",
187+
"SHACLValidationContextManager",
188+
"SHACLValidationError",
189+
"SHACLValidationResult",
190+
"SHACLValidationSkip",
191+
"SHACLValidator",
192+
"SHACLViolation",
193+
"ShapesList",
194+
"ShapesRegistry",
195+
"SkipRequirementCheck",
196+
"SourceSnippet",
197+
"SystemPager",
198+
"TextOutputFormatter",
199+
"ValidationCommandView",
200+
"ValidationStatisticsListener",
201+
"WarmUpResult"
202+
],
203+
"flagWords": [
204+
"accross",
205+
"becuase",
206+
"definately",
207+
"enviroment",
208+
"occured",
209+
"occurence",
210+
"paramter",
211+
"recieve",
212+
"refered",
213+
"seperate",
214+
"succesful",
215+
"teh",
216+
"untill"
217+
],
218+
"ignorePaths": [
219+
".git",
220+
".venv",
221+
"__pycache__",
222+
"*.lock",
223+
"*.bck",
224+
"*.mdbck",
225+
"poetry.lock",
226+
"tests/data/",
227+
],
228+
"languageSettings": [
229+
{
230+
"languageId": "python",
231+
"dictionaries": [
232+
"python"
233+
]
234+
},
235+
{
236+
"languageId": "toml",
237+
"dictionaries": [
238+
"python"
239+
]
240+
},
241+
{
242+
"languageId": "markdown",
243+
"dictionaries": [
244+
"python"
245+
]
246+
}
247+
]
248+
}

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
PYTHONPATH=rocrate_validator
1+
PYTHONPATH=rocrate_validator

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
token: ${{ secrets.GITHUB_TOKEN }}
5050
checkName: ⌛ Run tests
5151
ref: ${{ github.sha }}
52-
52+
5353
- name: Do something with a passing build
5454
if: steps.wait-for-testing.outputs.conclusion == 'success'
5555
run: echo "Testing pipeline passed" && exit 0
56-
56+
5757
- name: Do something with a failing build
5858
if: steps.wait-for-testing.outputs.conclusion == 'failure'
5959
run: echo "Testing pipeline failed" && exit 1
@@ -166,7 +166,7 @@ jobs:
166166
with:
167167
name: python-package-signatures
168168
path: dist/*.json
169-
169+
170170
# Create GitHub Release
171171
github_release:
172172
name: 🎉 Release on GitHub

‎.github/workflows/testing.yaml‎

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

4141
jobs:
42-
# Verifies pep8, pyflakes, circular complexity, and spelling
42+
# Verifies code style, bugs, complexity, and spelling via **ruff** + **typos**
4343
lint:
4444
name: 🚨 Lint and spellcheck
4545
runs-on: ubuntu-latest
@@ -51,10 +51,28 @@ jobs:
5151
uses: actions/setup-python@v6
5252
with:
5353
python-version: ${{ env.PYTHON_VERSION }}
54-
- name: 🔽 Install flake8
55-
run: pip install flake8
56-
- name: ⌛ Lint Python code
57-
run: flake8 -v rocrate_validator tests
54+
- name: 🔽 Install ruff (version from pyproject.toml)
55+
run: |
56+
# Read the ruff version constraint from pyproject.toml.
57+
# Poetry uses caret syntax (e.g. "^0.15.15") which means
58+
# "compatible with 0.15.x". pip uses PEP 440 "~=" for the
59+
# same semantics on pre-1.0 packages.
60+
pip install "$(
61+
python -c "
62+
import tomllib
63+
cfg = tomllib.loads(open('pyproject.toml').read())
64+
constraint = cfg['tool']['poetry']['group']['dev']['dependencies']['ruff']
65+
# Drop the caret prefix so we can pass ~= to pip
66+
version = constraint.lstrip('^')
67+
print(f'ruff~={version}')
68+
")"
69+
- name: ⌛ Lint Python code with ruff
70+
run: |
71+
# Produce GitHub annotations; suppress exit code so the
72+
# statistics summary still runs.
73+
ruff check rocrate_validator tests --output-format github || true
74+
# Emit a compact rule-count summary and fail the job if needed.
75+
ruff check rocrate_validator tests --statistics
5876
- name: ⌛ Spell check code and profiles (covers Python and SHACL)
5977
uses: crate-ci/typos@v1.47.0
6078

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ docs/_build
3131
# ignore IDE files
3232
.vscode/
3333
.idea/
34+
35+
extra_crates/
36+
extra_profiles/
37+
38+
*.back

0 commit comments

Comments
 (0)