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.

Sign up for GitHub

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

Jump to bottom

Update mapping startegy to fetch relevant parts of graph #16

Closed
wants to merge 39 commits into from
Closed

Update mapping startegy to fetch relevant parts of graph #16

wants to merge 39 commits into from

Commits on Aug 28, 2024

  1. Revert 1 remove session (EMMC-ASBL#229) 

    * update strategies

* fix pre-commit

* create json parse strategy

* update parse strategies

* Updated dlite storage path

* Fixed duplication of data model names. Improved readability of the code

* Instanciate the Pydantic datamodel from a dict

* Added error handling#

* Set collection_id. Updated datamodel

* Updated parse strategy

* Update json strategy config

* Update json strategy config

* Added entity to config

* camel case storagePath

* rename storage path

* Refactor initialize method

* add quantity to generate

* Revert "add quantity to generate"

This reverts commit e000232.

* remove unused session parameter

* update otelib version

* update requirements.txt

* update oteapi-core

* fix pylint errors

* remove unnecessary session parameter

* fix otelib version

* fix tests

* fix test_generate

* fix syntax

* fix test_generate collection

* fix test_filter

* fix test_generate_collection

* update dataresource in test_convert

* fix test_convert, and pylint

* fix tests

* test_parse_json

* test_parse_json

* fix test_parse

* fix test_convert

* fix pylint errors

* replace resourceconfig with Parserconfig in parse strategies

* fix parse strategy

* -

* revert

* Allow for defining triplestore backend in the mapping strategy (EMMC-ASBL#225)

* Allow for defining triplestore backend in the mapping strategy

Co-authored-by: Thomas F. Hagelien <[email protected]>

* -

* remove unnecessary files

* fix test_parse_json

* -

* fix import error

* fix path issue

* fix  test_mapping

* -

* fix collection

* update  config in test_config

* fix test_parse_excel

* fix test_parse_excel

* -

* fix excel parser

* -

* fix test_image_config

* remove unnecessary startegies

* run pre-commit

* fix pylint issues

* fix pylint and docs

* remove unused strategies and add doc strings

* remove unused test entities and files

* -

* -

* -

* fix warning

* Revert "Remove session"

---------

Co-authored-by: Thomas F. Hagelien <[email protected]>
Co-authored-by: Thomas Hagelien <[email protected]>
    @Treesarj @quaat
    3 people committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    b7e2b2f View commit details
    Browse the repository at this point in the history

  2. [Auto-generated] Update dependencies (EMMC-ASBL#231) 

    Update GH Actions:
Bump pypa/gh-action-pypi-publish from 1.8.12 to 1.8.14 (EMMC-ASBL#224)

Update dependencies:
* Update pytest requirement from ~=8.0 to ~=8.1 (EMMC-ASBL#227)
* Update mkdocstrings[python] requirement from ~=0.24.0 to ~=0.24.1 (EMMC-ASBL#226)

Update `pre-commit` hooks.


Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @TEAM4-0 @dependabot @Treesarj
    2 people authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    865fbe6 View commit details
    Browse the repository at this point in the history

  3. Update pytest-cov requirement from ~=4.1 to ~=5.0 (EMMC-ASBL#232) 

    Updates the requirements on [pytest-cov](https://github.com/pytest-dev/pytest-cov) to permit the latest version.
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-cov@v4.1.0...v5.0.0)

---
updated-dependencies:
- dependency-name: pytest-cov
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @Treesarj
    dependabot[bot] authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    3da37f1 View commit details
    Browse the repository at this point in the history

  4. Update pre-commit requirement from ~=3.6 to ~=3.7 (EMMC-ASBL#233) 

    Updates the requirements on [pre-commit](https://github.com/pre-commit/pre-commit) to permit the latest version.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @Treesarj
    dependabot[bot] authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c5037fd View commit details
    Browse the repository at this point in the history

  5. Update mkdocstrings[python] requirement from ~=0.24.1 to ~=0.24.3 (EM… 

    …MC-ASBL#235)

Updates the requirements on [mkdocstrings[python]](https://github.com/mkdocstrings/mkdocstrings) to permit the latest version.
- [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases)
- [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md)
- [Commits](mkdocstrings/mkdocstrings@0.24.1...0.24.3)

---
updated-dependencies:
- dependency-name: mkdocstrings[python]
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @Treesarj
    dependabot[bot] authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    0aebeef View commit details
    Browse the repository at this point in the history

  6. Bump chuhlomin/render-template from 1.9 to 1.10 (EMMC-ASBL#238) 

    Bumps [chuhlomin/render-template](https://github.com/chuhlomin/render-template) from 1.9 to 1.10.
- [Release notes](https://github.com/chuhlomin/render-template/releases)
- [Commits](chuhlomin/render-template@v1.9...v1.10)

---
updated-dependencies:
- dependency-name: chuhlomin/render-template
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @Treesarj
    dependabot[bot] authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    dfa58f9 View commit details
    Browse the repository at this point in the history

  7. Update pre-commit hooks

    @TEAM4-0 @Treesarj
    TEAM4-0 authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    fbd07c1 View commit details
    Browse the repository at this point in the history

  8. [pre-commit.ci] pre-commit autoupdate 

    updates:
- https://github.com/timothycrosley/isort → https://github.com/PyCQA/isort
- https://github.com/ambv/black → https://github.com/psf/black
- [github.com/psf/black: 24.4.0 → 24.4.2](psf/black@24.4.0...24.4.2)
- [github.com/pre-commit/mirrors-mypy: v1.9.0 → v1.10.0](pre-commit/mirrors-mypy@v1.9.0...v1.10.0)
    @pre-commit-ci @Treesarj
    pre-commit-ci[bot] authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    2762d9d View commit details
    Browse the repository at this point in the history

  9. Auto-merge pre-commit ci PRs to upgrade hooks

    @CasperWA @Treesarj
    CasperWA authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    6783ed7 View commit details
    Browse the repository at this point in the history

  10. Add pre-commit.ci config & remove pre-commit CI job

    @CasperWA @Treesarj
    CasperWA authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    3241a59 View commit details
    Browse the repository at this point in the history

  11. [Auto-generated] Update dependencies (EMMC-ASBL#247) 

    Update dependencies:
* Update mike requirement from ~=2.0 to ~=2.1 (EMMC-ASBL#244)
* Update pytest requirement from ~=8.1 to ~=8.2 (EMMC-ASBL#245)
* Update mkdocstrings[python] requirement from ~=0.24.3 to ~=0.25.1 (EMMC-ASBL#246)
* Update mkdocs requirement from ~=1.5 to ~=1.6 (EMMC-ASBL#243)


Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @TEAM4-0 @dependabot @Treesarj
    2 people authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    560ffc9 View commit details
    Browse the repository at this point in the history

  12. Update pylint requirement from ~=3.1 to ~=3.2 (EMMC-ASBL#248) 

    * Update pylint requirement from ~=3.1 to ~=3.2

Updates the requirements on [pylint](https://github.com/pylint-dev/pylint) to permit the latest version.
- [Release notes](https://github.com/pylint-dev/pylint/releases)
- [Commits](pylint-dev/pylint@v3.1.0...v3.2.1)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix for pylint. Note that this is not tested originally.

* Safety issue for jinja ignored

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: [email protected] <[email protected]>
    @dependabot @francescalb @Treesarj
    2 people authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c79d409 View commit details
    Browse the repository at this point in the history

  13. Update pre-commit hooks

    @TEAM4-0 @Treesarj
    TEAM4-0 authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    3ff0cd7 View commit details
    Browse the repository at this point in the history

  14. Parse strategy: Driver is not Optional, added test, added label

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    ada60ca View commit details
    Browse the repository at this point in the history

  15. Updated new dlite-parse tests

    @jesper-friis @Treesarj
    jesper-friis authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    03b89f9 View commit details
    Browse the repository at this point in the history

  16. Update pre-commit hooks

    @TEAM4-0 @Treesarj
    TEAM4-0 authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    1d7e794 View commit details
    Browse the repository at this point in the history

  17. New ci workflows based on tripper

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    39d01e2 View commit details
    Browse the repository at this point in the history

  18. renamed module from oteapi-dlite to oteapi_dlite

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    e673989 View commit details
    Browse the repository at this point in the history

  19. Updated pyproject.toml

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    3bd97e5 View commit details
    Browse the repository at this point in the history

  20. Readd pylint options

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    582e719 View commit details
    Browse the repository at this point in the history

  21. specified oteapi-core dep

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    cd66b2e View commit details
    Browse the repository at this point in the history

  22. Added testing requirements

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    1336e6c View commit details
    Browse the repository at this point in the history

  23. otelib is dependecy

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    df9282a View commit details
    Browse the repository at this point in the history

  24. disable pylint complaining on local import for test

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    ae9ba4a View commit details
    Browse the repository at this point in the history

  25. Removed unnecessary dep

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    9cd843b View commit details
    Browse the repository at this point in the history

  26. setup.py no longer needed

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    65e78d3 View commit details
    Browse the repository at this point in the history

  27. Removed tests for python 3.7 and 3.8

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    49b3b9e View commit details
    Browse the repository at this point in the history

  28. Pyyaml dep in testing

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    02c6772 View commit details
    Browse the repository at this point in the history

  29. Removed tests on python3.12 as oteapi-core does not support python3.12

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    77bb3c7 View commit details
    Browse the repository at this point in the history

  30. Added pydantic as dep even though it is also dep of dep for pre-commit

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    ca5ecd4 View commit details
    Browse the repository at this point in the history

  31. Commented out pydantic.mypy in pyproject.toml

    @jesper-friis @Treesarj
    jesper-friis authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    b436367 View commit details
    Browse the repository at this point in the history

  32. more pydantic dependencies

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    ad685f7 View commit details
    Browse the repository at this point in the history

  33. pydantic added to mypy dependencies in pre-commit

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    dffeec8 View commit details
    Browse the repository at this point in the history

  34. Added tests on windows for ci_tests

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    53230cb View commit details
    Browse the repository at this point in the history

  35. master is master and not main in pre-commit-config

    @francescalb @Treesarj
    francescalb authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    e403efb View commit details
    Browse the repository at this point in the history

  36. [bot] Update documentation

    @TEAM4-0 @Treesarj
    TEAM4-0 authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    24d61d1 View commit details
    Browse the repository at this point in the history

  37. Consolidate docs build (EMMC-ASBL#257) 

    Update CI/CD workflows to match pre-commit hooks
This is relevant only for building and testing the documentation.

Update documentation according to specific setup.
    @CasperWA @Treesarj
    CasperWA authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c6cf018 View commit details
    Browse the repository at this point in the history

  38. Release v0.2.2 - Changelog

    @TEAM4-0 @Treesarj
    TEAM4-0 authored and Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    e1cd1d4 View commit details
    Browse the repository at this point in the history

  39. update sparql to fetch data and object properties

    @Treesarj
    Treesarj committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    814cd61 View commit details
    Browse the repository at this point in the history