Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FEAT: Commons IP schema validation #60

Merged
merged 10 commits into from
Aug 29, 2024
Merged

FEAT: Commons IP schema validation #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
491f9af
FEAT: Commons IP schema validation
carlwilson Aug 11, 2024
e9dacbf
Merge remote-tracking branch 'origin/integration' into fix/commons-ip
carlwilson Aug 27, 2024
3f8ad91
MAINT: Merge integration into current branch.
carlwilson Aug 27, 2024
834fdfa
FIX: Deserialisation of rule_id
carlwilson Aug 27, 2024
9d7d6a4
Merge branch 'integration' into fix/commons-ip
carlwilson Aug 27, 2024
2935fdb
FEAT: Convert commons-ip representations
carlwilson Aug 27, 2024
ea44511
Merge branch 'fix/commons-ip' of github.com:E-ARK-Software/eark-valid…
carlwilson Aug 27, 2024
56deacc
FEAT: Final commons-ip compatibility tweaks
carlwilson Aug 28, 2024
3d3ce76
FIX: Support commons-ip use of NOTVALID
carlwilson Aug 29, 2024
1c65fe9
REV: Tidier use of ROOT in structure.py
carlwilson Aug 29, 2024
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
4 changes: 2 additions & 2 deletions eark_validator/infopacks/information_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def details_from_mets_file(mets_file: Path) -> PackageDetails:
except (etree.XMLSyntaxError, AttributeError) as ex:
raise ValueError(NOT_VALID_FILE.format(mets_file, 'XML')) from ex
return PackageDetails.model_validate({
'name': mets_file.parent.stem,
'label': label,
'othertype': othertype,
CONTENTINFORMATIONTYPE: contentinformationtype,
Expand All @@ -87,9 +88,8 @@ def from_path(package_path: Path) -> InformationPackage:
raise ValueError('No METS file found in package')
mets: MetsFile = MetsFiles.from_file(to_parse.joinpath(METS_FILE))
return InformationPackage.model_validate({
'name': to_parse.stem,
METS: mets,
'package': InformationPackages.details_from_mets_file(to_parse.joinpath(METS_FILE))
'details': InformationPackages.details_from_mets_file(to_parse.joinpath(METS_FILE))
})

@staticmethod
Expand Down
Loading
Loading