Merge Stuart's changes into main, + some polishing#86
Merged
Conversation
Config.py at the root of the project could not be conveniently used within the package. Transfered some of its content to setting.py Also removed the default TTL and JSON-LD directories, which are supposed to be set on the command line. (defaults to ./TTL and ./JSON-LD)
…inue clean up entry point is now "generate_sirp_files" in order to reflect the fact that both TTL and JSONLD files are generated. CLI options allow to redirect the output to specific directories. API now leaves in a separate repo Documentation has been updated to reflect past changes Clean up continues : the lone "resbod/utils.py" file has be moved to aboxes/rb_utils.py" so subdir resbod is removed. In order to be able to run from outside the directory, calls to gitlib Repo() now point to PKG_ROOT (as introduced in setting.py)
Contributor
Author
|
Hmm I see the failed tests. I'll fix that |
Crparedes
requested changes
May 7, 2026
Crparedes
left a comment
Crparedes
left a comment
Collaborator
There was a problem hiding this comment.
This is great, thank you very much @fmeynadier and @stuchalk !
I tested the branch regenerating the files and rebuilding the web services in the test environment. Everything works fine.
Made minor suggestions in parts of the documentation and in one line of the final logging message.
Co-authored-by: Cristhian Paredes <cristhian.paredes@bipm.org>
Co-authored-by: Cristhian Paredes <cristhian.paredes@bipm.org>
Co-authored-by: Cristhian Paredes <cristhian.paredes@bipm.org>
Co-authored-by: Cristhian Paredes <cristhian.paredes@bipm.org>
Co-authored-by: Cristhian Paredes <cristhian.paredes@bipm.org>
Co-authored-by: Cristhian Paredes <cristhian.paredes@bipm.org>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
@stuchalk @gregordudle @mgrub @laurenth974 @Crparedes
As announced last meeting, I created this branch from main, then merged SC_cleanup_repo in it. So it should include all updates we did on the main branch meanwhile.
Stuart, I did not manage to make your "config.py" file correctly for a regular packaging system, so I re-used your idea to use pathlib, but merged it directly into settings.py. If this misses some of the functionalities you intended, tell me and I'll try to compensate !
One major externally-visible change is that I switched the command from "generate_turtle_files" to "generate_sirp_files" (as it generates both TTL and JSONLD anyway). Apart from that I removed the API which now lives in the sirp-tools repo, update Readme, moved the (lone) resbod/utils.py file in aboxes, and made a few fixes that allow gitpython to find its way even when called outside of the repo.
If this suits everyone, I suggest we merge this into main and use it as our baseline from now on. Thanks Stuart for all the clean up !