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.

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

Update dic2owl to new annotated ontology schema #52

Merged
merged 9 commits into from
Aug 30, 2021
Merged

Update dic2owl to new annotated ontology schema #52

merged 9 commits into from
Aug 30, 2021

Conversation

CasperWA
Copy link
Contributor

@CasperWA CasperWA commented Aug 18, 2021

Fixes #56.

Update the dic2owl package and automatic ontology generation to the new annotated ontology schema introduced in #50.

@CasperWA CasperWA force-pushed the dic2owl branch 3 times, most recently from 3e14606 to 37b5bb0 Compare August 18, 2021 13:09
@CasperWA CasperWA force-pushed the dic2owl branch 3 times, most recently from a47d0d5 to a5185b9 Compare August 21, 2021 13:46
jesper-friis
jesper-friis previously approved these changes Aug 21, 2021
dic2owl/dic2owl/__init__.py Outdated Show resolved Hide resolved
@jesper-friis jesper-friis self-requested a review August 22, 2021 10:49
dic2owl/dic2owl/__init__.py Outdated Show resolved Hide resolved
dic2owl/dic2owl/cli.py Outdated Show resolved Hide resolved
dic2owl/dic2owl/dic2owl.py Outdated Show resolved Hide resolved
@CasperWA
Copy link
Contributor Author

@jesper-friis What do you say to this being merged? Before doing so I will up the dic2owl version, and then I'll merge it.

@jesper-friis
Copy link
Collaborator

Agree, it is time to merge. Just one thing, the dic2owl cli should actually call its main function when you call it as a script, be made executable (incl. shabang at top) and probably also added as a distributed script in setup.py

@CasperWA
Copy link
Contributor Author

Agree, it is time to merge. Just one thing, the dic2owl cli should actually call its main function when you call it as a script, be made executable (incl. shabang at top) and probably also added as a distributed script in setup.py

It should already do this - I made a mistake when adding the extra authors in the __init__.py file, making the package uninstallable. This has been fixed in ff4e1ef.

I will create a new issue from this comment however, which will cover adding other CI checks for dic2owl. Or maybe it should simply be a part of #57?

jesper-friis and others added 9 commits August 30, 2021 11:17
- Added workaround for EMMO-python.
Update doc-strings and type information.
Fixed the problem with adding top-level class in generated ontology.
Also added annotations.
Started on adding values.
Now the generation works - just two special cases left to handle + cleanup
Also corrected some typos in cif-ddl.ttl.

Added metadata to generated ontology.
- Run pre-commit.
- Add some typing.
- Make bandit check skip `urlretrieve` line, since `file://` will never
  be used as input.
- Satisfy pylint + mypy.
- Add pylint configuration in setup.cfg.
- Add mypy cache folder to .gitignore.
- Ensure `safety` checks the installed dependencies.
- Exchange `flake8` with `pylint` in pre-commit - updating files
  accordingly.
- Use `pyproject.toml` instead of `setup.cfg`.
- Set line-length to 79 (80) in `black` (`pylint`) tools.

Remove old ontology generation file.

Update requirements to be more lenient.

Minimize CI runs:
Only run `dic2owl` CI if a file change under `dic2owl/` and only run the
CI for `push`.

Update authors.

Mention CLI in doc-string for setup.py.

Remove `__main__` section in dic2owl.py.
Ensure `dic2owl` is installable through CI.
@CasperWA CasperWA marked this pull request as ready for review August 30, 2021 09:23
@CasperWA CasperWA merged commit 381ecc1 into main Aug 30, 2021
@CasperWA CasperWA deleted the dic2owl branch August 30, 2021 09:25
CasperWA added a commit that referenced this pull request Aug 30, 2021
CasperWA added a commit that referenced this pull request Aug 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix security issue with urllib.urlopen
3 participants