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

Merge vocexcel-parts used by voc4cat-tool (v2) #119

Merged
merged 149 commits into from
Jul 5, 2023
Merged

Merge vocexcel-parts used by voc4cat-tool (v2) #119

merged 149 commits into from
Jul 5, 2023

Conversation

dalito
Copy link
Member

@dalito dalito commented Jul 5, 2023

This is an improved version of #117.

This PR contains an experiment to merge the parts of VocExcel that we use. This has several advantages compared to further maintaining our fork of VocExcel. Future changes will affect just one code base which makes development a lot easier. Also it helps to avoid confusion with different VocExcel (ours and RDFLib/VocExcel). Moreover, we no longer use the term Excel™ as part of a "product" which IMHO is problematic.

I have merged the respective files including the full git-history to this PR´s branch. Some files/directories were moved to match the directory layout of this repository. The following command was used to rewrite the history in a local clone of NFDICat/VocExcel:

git filter-repo \
  --path tests/043_exhaustive_example.xlsx \
  --path tests/043_exhaustive_example_perfect_output.ttl \
  --path tests/043_simple_valid.xlsx \
  --path tests/test_models.py \
  --path tests/test_template043.py \
  --path tests/test_utils.py \
  --path .pre-commit-config.yaml \
  --path vocexcel/convert.py \
  --path vocexcel/convert_043.py \
  --path vocexcel/models.py \
  --path vocexcel/profiles.py \
  --path vocexcel/utils.py \
  --path vocexcel/validator.vocpub.ttl \
  --path vocexcel/blank_043.xlsx \
  --path-rename tests/043_exhaustive_example.xlsx:tests/templ_versions/043_exhaustive_example.xlsx \
  --path-rename tests/043_exhaustive_example_perfect_output.ttl:tests/templ_versions/043_exhaustive_example_perfect_output.ttl \
  --path-rename tests/043_simple_valid.xlsx:tests/templ_versions/043_simple_valid.xlsx \
  --path-rename vocexcel/:src/voc4cat/

The tool git filter-repo can be simply pipx-installed: pipx install git filter-repo (at least on Windows).

I will mark this as a draft. Still to do:

  • Change imports etc. to use the merged VocExcel code.
  • Clean up merged VocExcel-code that uses code that was not taken over.
  • Switching from MIT to BSD-3-Clause license since VocExcel uses BSD-3-clause-license and having to licenses is confusing.

After merging:

nicholascar and others added 30 commits May 25, 2021 00:03
…o reflect, fixed Concept children URIs & openpyxl active sheet
Changes Voc4cat license from MIT to BSD-3-Clause which is the licence
that the merged vocexcel code used.
The merged code is not fully covered in tests.
Coverage drops from 100 % to 93 %.
There are still several unsolved ruff linter complaints.
@dalito dalito merged commit 548c4ff into main Jul 5, 2023
3 checks passed
@dalito dalito deleted the merge-vocexcel2 branch July 5, 2023 11:33
@dalito dalito added this to the 0.6.0 milestone Jul 15, 2023
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.

None yet

4 participants