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

v2.0.0[deprecated] #49

Merged
merged 72 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
5442832
introduce new mapping file schema
MBueschelberger Mar 21, 2024
8de7259
update example files with new schema
MBueschelberger Mar 21, 2024
2891ad6
update column name for class type in example file
MBueschelberger Mar 21, 2024
2f15bf4
introduce dcterms mapping, annotations from values and new iris of i…
MBueschelberger Mar 26, 2024
ed76f47
fix end of files hook
MBueschelberger Mar 26, 2024
31ff269
make method graph optional
MBueschelberger Mar 27, 2024
053b3ef
fix pytests
MBueschelberger Mar 27, 2024
0de9fb9
fix end of file for method graph
MBueschelberger Mar 27, 2024
03cd79e
add sparql utility for qudt unit
MBueschelberger Mar 28, 2024
c28a4fe
add qudt and csvw schema
MBueschelberger Apr 2, 2024
28db0ca
update examples and setup.cfg
MBueschelberger Apr 2, 2024
4f9923a
bring back id for quantity individuals
MBueschelberger Apr 2, 2024
c41cef6
remove unneeded csvw:datatype
MBueschelberger Apr 2, 2024
b585efb
update method graph
MBueschelberger Apr 3, 2024
4e767fb
update method graph
MBueschelberger Apr 5, 2024
a34f24d
fix pre commit hooks
MBueschelberger Apr 5, 2024
18dc41e
fix pre commit hooks
MBueschelberger Apr 5, 2024
c0e08a9
adapt method graph
MBueschelberger Apr 5, 2024
7254ece
update example notebook
MBueschelberger Apr 5, 2024
91cbc3c
remove remaining emmo-related files and modules, minor repository res…
MBueschelberger Apr 11, 2024
69a354d
Bump version v1.1.0 -> v2.0.0rc0
MBueschelberger Apr 11, 2024
56b4065
remove python-magic
MBueschelberger Apr 12, 2024
9364d49
update setup.cfg
MBueschelberger Apr 12, 2024
8595391
hotfix: qudt utils
MBueschelberger Apr 12, 2024
b5ce4d1
entirely restructure parsers and mappings
MBueschelberger Apr 14, 2024
1072a56
update annotationpipeline
MBueschelberger Apr 15, 2024
f7a3943
update pytests
MBueschelberger Apr 15, 2024
2f561dc
add plain metadata and enhance pytests
MBueschelberger Apr 15, 2024
066fa64
update json mapping file
MBueschelberger Apr 15, 2024
bce9688
introduce new excel parser
MBueschelberger Apr 15, 2024
1580878
update unittests and results
MBueschelberger Apr 15, 2024
5caadf7
debug retrieval of subgraphs
MBueschelberger Apr 15, 2024
27b75d8
Bump version v2.0.0rc0 -> v2.0.0rc1
MBueschelberger Apr 15, 2024
86fe63e
update unittests and range of python versions tested in github ci
MBueschelberger Apr 16, 2024
8d7fd6a
make sure that also a bad config can be safely passed to the pipeline(s)
MBueschelberger Apr 16, 2024
5bfc49c
Bump version v2.0.0rc1 -> v2.0.0rc2
MBueschelberger Apr 16, 2024
8425a2b
make pipeline(s) more sensitive for bad configurations, add respectiv…
MBueschelberger Apr 16, 2024
9490c1b
make the a public function
MBueschelberger Apr 16, 2024
c990736
Bump version v2.0.0rc2 -> v2.0.0rc3
MBueschelberger Apr 16, 2024
3d321eb
update excel parser to find end of time series automatically and add …
MBueschelberger Apr 16, 2024
f9602a8
Bump version v2.0.0rc3 -> v2.0.0rc4
MBueschelberger Apr 16, 2024
a1e089d
update assigning of columns in time series
MBueschelberger Apr 16, 2024
fa6825b
debug pytests
MBueschelberger Apr 16, 2024
8be7f1b
Bump version v2.0.0rc4 -> v2.0.0rc5
MBueschelberger Apr 16, 2024
d91266b
add missing config to submodels
MBueschelberger Apr 16, 2024
1b1df65
Bump version v2.0.0rc5 -> v2.0.0rc6
MBueschelberger Apr 16, 2024
5177bc7
make unit-retrieval optional for excel parser, migrate some configs t…
MBueschelberger Apr 17, 2024
d2ce4cc
Bump version v2.0.0rc6 -> v2.0.0rc7
MBueschelberger Apr 17, 2024
93158bb
introduce json parser
MBueschelberger Apr 17, 2024
afb2b3e
Bump version v2.0.0rc7 -> v2.0.0rc8
MBueschelberger Apr 17, 2024
5fe01d3
add support for mapping files in csv
MBueschelberger Apr 18, 2024
db4db40
Bump version v2.0.0rc8 -> v2.0.0rc9
MBueschelberger Apr 18, 2024
86e3f13
update examples
MBueschelberger Apr 29, 2024
7c88316
update examples 2
MBueschelberger Apr 29, 2024
612cf16
support plain file content for parsers alongside file paths, add unit…
MBueschelberger Jun 6, 2024
796c3ce
change strategy whether string is a path or content
MBueschelberger Jun 6, 2024
fdcfdff
Bump version v2.0.0rc9 -> v2.0.0rc10
MBueschelberger Jun 6, 2024
a906c5d
fix problem in extra_triples-validator
MBueschelberger Jun 14, 2024
d8ed3e9
Bump version v2.0.0rc10 -> v2.0.0rc11
MBueschelberger Jun 14, 2024
d904606
add functionality to remove unneeded chars from plain text parsers, e…
MBueschelberger Jun 17, 2024
4f07ea9
Bump version v2.0.0rc11 -> v2.0.0rc12
MBueschelberger Jun 17, 2024
c8d5b93
let data2rdf also handle time series data without metadata
MBueschelberger Jun 20, 2024
d02d61a
update example notebook
MBueschelberger Jun 20, 2024
be8440f
update csvw schema for tabular parsers when only metadata, only times…
MBueschelberger Jun 20, 2024
6d2ba58
fix problem when an iri is passed to unit instead of string
MBueschelberger Jun 20, 2024
be9716d
Bump version v2.0.0rc12 -> v2.0.0rc13
MBueschelberger Jun 20, 2024
a9bf124
fix behaviour when unit is not given in the 2nd column of time series
MBueschelberger Jun 24, 2024
4f6c277
Bump version v2.0.0rc13 -> v2.0.0rc14
MBueschelberger Jun 24, 2024
50c6e8d
add functionality to keep nan-values, make separators for time series…
MBueschelberger Jun 28, 2024
256ac17
update pipeline
MBueschelberger Jun 28, 2024
8411d54
Bump version v2.0.0rc14 -> v2.0.0rc15
MBueschelberger Jun 28, 2024
bf185b0
update parsing strategy for time series in xlsx, update time_series d…
MBueschelberger Jul 11, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:

Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Update Coverage on Readme
on:
push:

# https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
# `contents` is for permission to the contents of the repository.
# `pull-requests` is for permission to pull request
permissions:
contents: write
checks: write
pull-requests: write

jobs:
update-coverage-on-readme:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo

- name: Pytest coverage comment
# if: ${{ github.ref == 'refs/heads/main' }}
id: coverageComment
uses: MishaKav/pytest-coverage-comment@main
with:
hide-comment: true
pytest-coverage-path: ./data/pytest-coverage_4.txt

- name: Update Readme with Coverage Html
# if: ${{ github.ref == 'refs/heads/main' }}
run: |
sed -i '/<!-- Pytest Coverage Comment:Begin -->/,/<!-- Pytest Coverage Comment:End -->/c\<!-- Pytest Coverage Comment:Begin -->\n\${{ steps.coverageComment.outputs.coverageHtml }}\n<!-- Pytest Coverage Comment:End -->' ./README.md

- name: Commit & Push changes to Readme
#if: ${{ github.ref == 'refs/heads/main' }}
uses: actions-js/push@master
with:
message: Update coverage on Readme
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repos:
rev: 6.0.0
hooks:
- id: flake8
args: [--count, --show-source, --statistics, '--ignore', 'E501,E203,W503']
args: [--count, --show-source, --statistics, '--ignore', 'E501,E203,W503,E201,E202,E221,E222,E231,E241,E271,E272,E702,E713']
# additional_dependencies: [flake8-bugbear==21.3.1, pep8-naming]
log_file: flake8.log

Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ A pipeline for generating data representation in RDF out of raw data given in AS

https://data2rdf.readthedocs.io/en/latest/

<!-- Pytest Coverage Comment:Begin -->
<!-- Pytest Coverage Comment:End -->

# Installation

## Install for using the package
Expand Down
21 changes: 21 additions & 0 deletions data2rdf/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
"""Data2RDF"""

from .config import Config
from .models import (
BasicConceptMapping,
ClassConceptMapping,
PropertyMapping,
QuantityMapping,
)
from .parsers import Parser
from .pipelines import AnnotationPipeline

__all__ = [
"AnnotationPipeline",
"Config",
"QuantityMapping",
"PropertyMapping",
"ClassConceptMapping",
"BasicConceptMapping",
"Parser",
]
206 changes: 0 additions & 206 deletions data2rdf/abox_template_generation.py

This file was deleted.

24 changes: 0 additions & 24 deletions data2rdf/annotation_confs.py

This file was deleted.

Loading
Loading