-
Notifications
You must be signed in to change notification settings - Fork 8
(Draft) New Data Model #480
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.
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
Draft
SKernchen
wants to merge
281
commits into
develop
Choose a base branch
from
refactor/data-model
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
281 commits
Select commit
Hold shift + click to select a range
a527fb0
Add test for helpers.
led02 2fbe1e0
Using mock_document for setup.
led02 e362b15
Remove test for pyld internals.
led02 8b2e59f
Switch test to use mock_context from helpers.
led02 4b8c3b7
Added more tests.
led02 3bceb49
Restructured tests for ld_container (type conversions).
led02 ef2eb70
Update poetry lock to get CI running.
led02 af21ace
Fix linting errors.
led02 8b4f9a3
Delete tests for old data model.
led02 d825217
Disable tests that fail due to missing old data model.
led02 d9761ab
Fix test for mock document.
led02 9113c7b
Fix mock document.
led02 df5b0ef
Silence flake8 on inactive tests.
led02 4fe4ffb
Silence flake8 on inactive tests more agressively.
led02 797ded3
Fix handling of identifier in compaction and expansion.
led02 026b09f
Disable tests that fail due to missing old data model.
led02 b347dc2
Silence flake8 on inactive tests.
led02 7a2b0d6
Silence flake8 on inactive tests more agressively.
led02 d577aab
Revert "Silence flake8 on inactive tests more agressively."
led02 b432ccf
Revert "Silence flake8 on inactive tests."
led02 6a10129
Revert "Disable tests that fail due to missing old data model."
led02 82b45e5
Delete tests for old data model.
led02 de09fdb
Revert "Delete tests for old data model."
led02 158c8d3
Merge branch 'feature/347-update-build_backend' into refactor/data-model
sdruskat 73df3ea
Merge pull request #417 from softwarepub/refresh-based-on-develop
sdruskat 6bcdbe9
Show skipped tests when running
sdruskat 80cade3
Merge pull request #415 from softwarepub/refactor/411-disable-tests
sdruskat 7b10cdc
Merge pull request #403 from softwarepub/refactor/383-test-ld_context
sdruskat 0edc582
Merge remote-tracking branch 'origin/refactor/data-model' into refact…
led02 68aec7f
Update poetry.lock for added test dependencies.
led02 ea08105
Add missing dependencies again.
led02 409b43a
Add test file for `ld_dict`
sdruskat 6c7baf8
Merge branch 'refactor/data-model' into refactor/384-test-ld_dict
sdruskat 2969b09
Merge pull request #398 from softwarepub/refactor/381-test-ld_container
SKernchen 0193974
Merge pull request #414 from softwarepub/refactor/412-fix-id-issues
SKernchen 79ffbc6
Fix typos in docstring
sdruskat f869336
Merge branch 'refactor/data-model' into refactor/372-test-pyld-util
bb7741b
Add missing license header
78af0b5
Use correct field name in tests
sdruskat c1a0448
Fix KeyError and first Tests for ld_list
4cb2af0
Mark test as expectedly failing due to #419
sdruskat 32c41f1
Make passing xfail tests fail test suite
sdruskat 9e7ecf5
Mark another test as expectedly failing due to #419
sdruskat d4e2366
Parametrize xfailing test getting CodeMeta items, re-format
sdruskat 1f4501c
Test correct inputs for getting expanded terms from prefixed vocabula…
sdruskat 5512f7e
Test raises when prefix doesn't exist for compacted input
sdruskat 3262691
Test raises when term doesn't exist for compacted input
sdruskat 241f914
Remove duplicate tests, and not-to-be-tested parameters
sdruskat ebe9200
Improve reporting unexpected exceptions and add tests for expanded in…
sdruskat de0f24a
Add test for unimplemented and undecided functionality
sdruskat 3793e7c
Report unexpectedly raised exception
sdruskat 586201e
Rename module to match hermes.error
sdruskat e99d930
Define context error, fix bad naming
sdruskat 0260ab5
Rename error (add prefix)
sdruskat ad4221b
Merge branch 'refactor/define-model-errors' into refactor/384-mark-ex…
sdruskat 6c4a523
Raise new error when getting term whose prafix is not in context
sdruskat 1242311
Test that non-existent prefix raises error on getting item
sdruskat 9621e77
Add xfailing test for returning only existing terms from given vocabu…
sdruskat 9a980b4
Test raising context errors where implemented
sdruskat b808152
Raise context error on empty string, reformat
sdruskat 0d61163
Pacify flake8
sdruskat e9ca175
Satisfy REUSE
sdruskat 629bec9
Merge pull request #420 from softwarepub/refactor/define-model-errors
sdruskat 9109d52
wrote first testsfor ld_dict
4fd198f
added missing dependency
0c4a500
added more tests
75f2b66
added two more test cases
0ca9af4
fixed small bug
f3133e8
added tests for ld_list
71a5f87
fixed bug in __getitem__
23eda6c
added support for slices and fixed bug in __setitem__
562f3bf
linted ld_list.py and test_ld_list.py
2679a0a
added more tests
1da06c3
fixed small bug in __iter__ of ld_list
8975cf9
added FIXME and linted test_ld_list.py
f29875b
added tests and adjusted some according to what was discussed in a me…
76a93b2
added check to __init__ of ld_dict
af19fcc
suggested fix for nested conversions
f4621ab
fixed formatting mistakes
da2f010
added a fixme comment
d822fb5
added some edge cases to the tests
4c1631d
Merge branch 'refactor/data-model' into refactor/384-test-ld_dict
sdruskat 1feddda
Add basic implementation of API class
sdruskat 74ba45d
Test initialization of API class
sdruskat e709d6f
added fixme comments and two test cases and removed unused pytest marker
88fd409
adjusted tests and ld_list as ld_list.itemlist should be expanded jso…
63de367
added more fixme comments and test cases
99571c5
added (all) missing kw args to __init__.py (#364)
4dce650
added fixme string
29f0a8a
removed false/ unnecessary fixme
79575b8
Test API object initiatlization with and without data
sdruskat 69f6a24
Test API object initialization with nested object
sdruskat 8e1a38b
Test appending objects to model via API
sdruskat b65989e
Test model building via API object
sdruskat a08eaf2
Correct context parameter to list
c6fab45
Fixes test input format and describes all problems
SKernchen fce1519
added another case for testing of get and added the issue number to a…
59180c7
added an add method to SoftwareMetadata and improved __init__ of it a…
daed5d3
Change existing test to assume returned lists
sdruskat 4583915
Add test for harvesting case
sdruskat 6808272
Add more comprehensive usage test
sdruskat 2f7eadf
Add new license annotation for Python files
sdruskat 0f32494
changed conversions of types to output ld_lists for every item in a dict
8298e49
added some tests for the conversions and formated to satisfy flake8
3a8bfbe
added three more conversions for container to expanded json
2ef89d3
always return a list when getting an item from ld_dict
2db93cf
added tests and fixed issues
f38b662
changed type conversions as discussed in #423 and #433 and tweaked th…
1721325
clean up
1ecd0f8
suggestion for fix of #435
1fb7574
Comment out local extension that breaks build
sdruskat 8d147a8
Document data model API
sdruskat 7e1ac64
Update dependency lock
sdruskat 5fde82a
added contains and equals check for ld_list with tests and added issu…
9be8041
removed tests of unclear matters (@type and @context fields) and adde…
c34fc81
Merge branch 'refactor/data-model' into refactor/384-test-ld_dict
SKernchen 39d25e9
Merge pull request #410 from softwarepub/refactor/384-test-ld_dict
SKernchen dd854c7
Track data in model in simplified form
sdruskat f4c1e7d
Link to dummy section
sdruskat 97ebad4
Make tone less intimidating, more neutral/positive
sdruskat da136c3
changed ld_list according to issue #439
03ebd32
implemented tests for problem 2 of the issue and more tests
d1eb612
added a few missing conversions and formatted the file a little bit d…
d28dc10
removed one conversion, added one and changed _to_python to fix conve…
fb5aa64
fixed formatting errors
5248853
fixed ld_container tests, a type conversion and equals of ld_list
c233573
First tests for ld_proc
SKernchen d5f64e1
Happy case test jsonldproc
SKernchen e2c1bba
added detailed comparison for ld_list, ld_dict and json_values and ad…
aeb88fb
added support for graph and set again and improved expansion of json-ld
007e3a3
removed unnecessary lambda
a68f2ae
Add test file
sdruskat 3c9ea61
fixed set and from_list and added del
66e03df
updated tests of ld_container and fixed found bugs
c4aea65
pacified flake8
7d30b16
improved ld_list.__contains__ and added tests for it
f8d259f
added one TODO item to ld_list
2b98627
began adding doc strings, type hints and comments for ld_container
1958518
improved _to_expanded_json
4acf8de
added doc-strings and comments and pacified flake8
b751130
began commenting and adding doc-strings to ld_list
3c243f2
fixed bug in _to_expanded_json
e0f0fc9
added a few test cases to delete of ld_list
1b5656e
added more comments to ld_list
071630c
added more doc strings
d4b34b4
corrected type hints
f0f1818
documented the rest of the methods in ld_container
460e3d4
Merge pull request #374 from softwarepub/refactor/372-test-pyld-util
SKernchen c72353e
Merge branch 'refactor/data-model' into refactor/384-mark-expected-fa…
SKernchen e86d5fe
Merge pull request #421 from softwarepub/refactor/384-mark-expected-f…
SKernchen bcc233d
implemented list comparison and added tests for it
287d37a
added tests and fixed small bug and fixed typos
5f2214e
Merge pull request #445 from softwarepub/refactor/439-restrict-ld_list
SKernchen 14868ad
Merge branch 'refactor/data-model' into refactor/385-test-ld_list
notactuallyfinn 20fbefc
fixed ld_dict tests
504a345
removed unnecessary fixme
0999f44
Delete deprecated function
SKernchen 6bc1648
Merge pull request #418 from softwarepub/refactor/385-test-ld_list
SKernchen 7adb02f
Merge branch 'refactor/data-model' into refactor/423-implement-public…
SKernchen 6f039e8
slightly adjusted tests and fixed miniature bugs in ld_container and …
c2b9c4f
cleaned up __init__.py
bd1a19f
ran 'poetry lock'
9527e26
updated type hints to be supported by python 3.10
97d9d95
update type hints and began commenting ld_dict
cd6e3d5
added and updated comments
95288a2
added first e2e harvest test for SoftwareMetadata
de457e3
Apply Style Changes (Author names instead of foo etc.)
SKernchen e9d010f
Correct lower letters for emails
SKernchen 23ec20c
Merge branch 'refactor/423-implement-public-api' into refactor/423-im…
SKernchen 8ace58c
Merge pull request #438 from softwarepub/refactor/423-implement-publi…
SKernchen 605201d
fixed small bug in set_item of ld_dict
4920090
added more tests
38ef40e
refactored end to end tests
eb6f587
Fix compact_iri for schema elements with containers
SKernchen ddcd26a
updated creation of SoftwareMetadata objects in e2e tests
9b44b53
added tests and support for curate step
6c3ba13
started to add support for deposit step and added useful method for S…
0284b01
Correct Docs for newer functionality
SKernchen d46394e
Correct type of value
SKernchen feeb16b
worked on invenio deposit
4f6cc9d
Merge branch 'refactor/data-model' into feature/454-e2e-deposit
ed0916b
fixed bugs in invenio.py
382e2c3
fixed bug and adjusted tests
96861ec
adjusted invenio.py and its test a bit
4887eae
Merge pull request #432 from softwarepub/refactor/423-implement-publi…
SKernchen 248ae33
added adjusted files from feature/153-refactor-datamodel for process
ebebca4
added first tests
f21df49
(re)added version and help commands to the available commands
d4d9ca8
made test for process step more complex
7cfa7bc
made process step and ld_container._to_expanded_json more robust
520ef39
improved flake8 rating
8606933
Merge branch 'refactor/423-implement-public-api' into feature/454-e2e…
SKernchen d04b0e2
Remove SysExit call
SKernchen 13a0952
Fix typo
SKernchen bcdc821
added lots of comments and fixed small inconsistencies
1c10dca
added coments and fix small bug
aa4284e
removed unnecessary print statements
4080091
json_ids are now returned as ld_dicts instead of the id string
b7543ee
reworked merging and added strategies
08619ee
fixed formation errors
ac36a28
updated strategies and match functions
3291c4d
formatting and doc strings
7365526
Merge branch 'feature/454-e2e-test-plugin-api' into feature/454-e2e-c…
notactuallyfinn 62f1345
Merge pull request #468 from softwarepub/feature/454-e2e-curate
notactuallyfinn 1e781ca
fixed mistake in merge
2878155
Merge pull request #470 from softwarepub/feature/454-e2e-process
notactuallyfinn 57cdfb0
Merge branch 'feature/454-e2e-test-plugin-api' into feature/454-e2e-d…
notactuallyfinn e5065c2
Merge pull request #469 from softwarepub/feature/454-e2e-deposit
notactuallyfinn 0e8b49c
fixed minor bugs
bd7e732
adapted postprocess and added test
a30d385
changed imports and fixed syntax error for python 3.10
50c58d3
Merge pull request #475 from softwarepub/feature/454-e2e-postprocess
notactuallyfinn 230ee05
fixed syntax error and added lost dependency
1fcbb4b
adjusted comments and config for doc build to try get it running
65f3d10
tweeked documentation a bit
4f3372c
tweeked documentation of ld_list
45459fc
improved comments for ld_dict
8afb37b
split test_api_e2e.py into multiple files
4a08fbe
added and updated comments
1d1c18d
commented the rest of the new files
02340e0
added support for user defined merge strategies
5e296cb
added class to ignore list for autoapi
630dd00
updated documentation for plugin development, made curate pluginizabl…
296fbb7
fixed formatting errors
758dbde
reactivated tests and added afew log calls
7de8c7d
applied simple suggestions
ad63e5a
fixed misspelled class name
7a8e8ae
implemented suggestions and fixed bug
9d3dc7f
added test_case and generate strategies automatically
c699ae2
finished implementation of CodemetaProcessPlugin
d514c9f
implement more comments
ba8b549
add codemeta_doi postprocess plugin
9b1c48a
reworked zenodo_sandbox_auth for cli testing
55e086d
fix post process and add license header to conftest.py
9d770a1
improve error handling of commands
180cc10
make process more verbose for errors while merging
0251cd1
potentially fixed error where multiple record ids are halucinated.
73467f5
flake8
34877b9
adjusted logging a bit
a0c0005
fix tests that are affected by error handling update
279e672
added another process test and fixed small bug
65399be
flake8
89191ec
Imporve first cli harvest tests
SKernchen a42c315
add reject strategies for special properties
9294d0a
Add good case tests for cli
SKernchen e40965d
Merge pull request #456 from softwarepub/feature/454-e2e-test-plugin-api
SKernchen 5108696
Ignore flake8 C901 (too complex)
SKernchen 224d5b7
Merge pull request #479 from softwarepub/refactor/423-implement-publi…
SKernchen 3e7c83d
update dependencies
23a11b3
add/ update comments and doc strings
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| This work is being provided by the copyright holders under the following license. | ||
|
|
||
| License | ||
| By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions. | ||
|
|
||
| Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications: | ||
|
|
||
| • The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. | ||
| • Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included. | ||
| • Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright (c) [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." | ||
|
|
||
| Disclaimers | ||
| THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. | ||
|
|
||
| COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. | ||
|
|
||
| The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # SPDX-FileCopyrightText: 2026 German Aerospace Center (DLR) | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| # SPDX-FileContributor: Michael Fritzsche | ||
|
|
||
| # add option to pass zenodo sandbox auth token to pytest to run ./test/hermes_test/commands/deposit/test_invenio_e2e.py | ||
| def pytest_addoption(parser): | ||
| parser.addoption("--sandbox_auth", action="store", default=None) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should a top-level conftest exist? I think this belongs into
test/ortest/hermes_test/