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

Add meta field to entry model #1698

Merged
merged 77 commits into from
Oct 20, 2024
Merged

Add meta field to entry model #1698

merged 77 commits into from
Oct 20, 2024

Commits on Jul 6, 2023

  1. Addded meta field to entry model

    @JPBergsma
    JPBergsma committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    eecc878 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Added validator for meta field.

    @JPBergsma
    JPBergsma committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    6ed4a5d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    5e0ace4 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Update pyyaml version in requirements.txt

    @JPBergsma
    JPBergsma authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    ef1ca3c View commit details
    Browse the repository at this point in the history

  2. Update requirements.txt

    @JPBergsma
    JPBergsma authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    89ac0fe View commit details
    Browse the repository at this point in the history

  3. Update requirements.txt

    @JPBergsma
    JPBergsma authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    f229be1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    fcc501c View commit details
    Browse the repository at this point in the history

  5. Remove test structures to get an idea of what triggers yaml import er… 

    …ror on github.
    @JPBergsma
    JPBergsma committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    a195fb5 View commit details
    Browse the repository at this point in the history

  6. Readding meta field to test_good_structures.

    @JPBergsma
    JPBergsma committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    07d77fe View commit details
    Browse the repository at this point in the history

  7. Readding meta field to test_structures.json.

    @JPBergsma
    JPBergsma committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2848dd3 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Added handling None for property_metadata to validator + small correc… 

    …tionds.
    @JPBergsma
    JPBergsma committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    80c4dc4 View commit details
    Browse the repository at this point in the history

  2. Added test for validator per entry meta field.

    @JPBergsma
    JPBergsma committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    d55abec View commit details
    Browse the repository at this point in the history

  3. Added test for presence metadata field in test_structures.py.

    @JPBergsma
    JPBergsma committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    ff545bb View commit details
    Browse the repository at this point in the history

  4. Remove metadata fields when the fields that they belong to are not re… 

    …turned.
    @JPBergsma
    JPBergsma committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    e0d6ff3 View commit details
    Browse the repository at this point in the history

  5. add extra test for bad prefix.

    @JPBergsma
    JPBergsma committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    191fbba View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    8764e34 View commit details
    Browse the repository at this point in the history

  2. Test if dependancy conflict causes error.

    @JPBergsma
    JPBergsma committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    6251e48 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    c6be5ca View commit details
    Browse the repository at this point in the history

  4. Revert "Test if dependancy conflict causes error." 

    This reverts commit 6251e48.
    @JPBergsma
    JPBergsma committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    bf9692a View commit details
    Browse the repository at this point in the history

  5. Revert "Revert "Test if dependancy conflict causes error."" 

    This reverts commit bf9692a.
    @JPBergsma
    JPBergsma committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    0864911 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'JPBergsma/add_metadata' of https://github.com/JPBergsma… 

    …/optimade-python-tools into JPBergsma/add_metadata
    @JPBergsma
    JPBergsma committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    03f91f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. correct version httpx.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    eb953ad View commit details
    Browse the repository at this point in the history

  2. commenting out validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    2879fac View commit details
    Browse the repository at this point in the history

  3. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    18e2ef1 View commit details
    Browse the repository at this point in the history

  4. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    7fc1906 View commit details
    Browse the repository at this point in the history

  5. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    b622414 View commit details
    Browse the repository at this point in the history

  6. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    95bf11b View commit details
    Browse the repository at this point in the history

  7. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    7c02f38 View commit details
    Browse the repository at this point in the history

  8. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    2b52248 View commit details
    Browse the repository at this point in the history

  9. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    20e228d View commit details
    Browse the repository at this point in the history

  10. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    7be2a0f View commit details
    Browse the repository at this point in the history

  11. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    bffb5d1 View commit details
    Browse the repository at this point in the history

  12. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    1f0bbb9 View commit details
    Browse the repository at this point in the history

  13. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    7c0a8be View commit details
    Browse the repository at this point in the history

  14. Slowly reassembling validator to see if this resolves issue github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    456f34f View commit details
    Browse the repository at this point in the history

  15. Slowly reassembling validator to see if this resolves issue Github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    9603277 View commit details
    Browse the repository at this point in the history

  16. Slowly reassembling validator to see if this resolves issue Github.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    c621412 View commit details
    Browse the repository at this point in the history

  17. Slowly reassembling validator to see if this resolves issue Github..

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    ed44736 View commit details
    Browse the repository at this point in the history

  18. Slowly reassembling validator to see if this resolves issue Github..

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4f28acc View commit details
    Browse the repository at this point in the history

  19. Placed yaml import in try except block.

    @JPBergsma
    JPBergsma committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    63af8dc View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Added more cases to test data and added bugfix for removing associate… 

    …d metadata when a field is excluded.
    @JPBergsma
    JPBergsma committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    5b41b71 View commit details
    Browse the repository at this point in the history

  2. Removed seemingly unneccesary mypy ignore exception statement.

    @JPBergsma
    JPBergsma committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    f694d15 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    5bac762 View commit details
    Browse the repository at this point in the history

  4. remove change in version pyyaml in requirements.txt.

    @JPBergsma
    JPBergsma committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    40ff136 View commit details
    Browse the repository at this point in the history

  5. correct spelling mistake

    @JPBergsma
    JPBergsma committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    8f7ca29 View commit details
    Browse the repository at this point in the history

  6. moved starts_with_supported_prefix and check_starts_with_supported_pr… 

    …efix functions to BaseresouceMapper.
    @JPBergsma
    JPBergsma committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    6a20ef9 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Expanded docstring check_starts_with_supported_prefix

    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    e95c9b4 View commit details
    Browse the repository at this point in the history

  2. Expanded docstring check_starts_with_supported_prefix

    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    bcd7971 View commit details
    Browse the repository at this point in the history

  3. Added return type for starts_with_supported_prefix and check_starts_w… 

    …ith_supported_prefix.
    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    748bacc View commit details
    Browse the repository at this point in the history

  4. Added return type for starts_with_supported_prefix and check_starts_w… 

    …ith_supported_prefix.
    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    8430ddd View commit details
    Browse the repository at this point in the history

  5. Adjusted validators baseed on suggestion Matthew. 

    Co-authored-by: ml-evs [email protected]
    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ac26f09 View commit details
    Browse the repository at this point in the history

  6. small corrections validators.

    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    e1c4901 View commit details
    Browse the repository at this point in the history

  7. small correction in removing unrequested metadata.

    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    7dab3a7 View commit details
    Browse the repository at this point in the history

  8. Added spaces before values 'exmpl_originates_from _project'.

    @JPBergsma
    JPBergsma committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    da8a026 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. merge with master

    @JPBergsma
    JPBergsma committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    944d374 View commit details
    Browse the repository at this point in the history

  2. update openapijson

    @JPBergsma
    JPBergsma committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    04e9ff6 View commit details
    Browse the repository at this point in the history

  3. update openapijson

    @JPBergsma
    JPBergsma committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    5368934 View commit details
    Browse the repository at this point in the history

  4. update openapijson

    @JPBergsma
    JPBergsma committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    bccbe73 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. use lstrip instead of manually removing / one at a time.

    @JPBergsma
    JPBergsma committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    63651f1 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Update optimade/models/entries.py 

    update description property_metadata field

Co-authored-by: Matthew Evans <[email protected]>
    @JPBergsma @ml-evs
    JPBergsma and ml-evs authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    389e679 View commit details
    Browse the repository at this point in the history

  2. Update description per entry meta datafield.

    @JPBergsma
    JPBergsma committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    4ec23c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    05b2906 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1cd73e3 View commit details
    Browse the repository at this point in the history

  3. update openapijson.

    @JPBergsma
    JPBergsma committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    d3b8b22 View commit details
    Browse the repository at this point in the history

  4. trying to merge with remote.

    @JPBergsma
    JPBergsma committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    8ae4081 View commit details
    Browse the repository at this point in the history

  5. try to see if moving yaml is still necessary.

    @JPBergsma
    JPBergsma committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    68f14d3 View commit details
    Browse the repository at this point in the history

  6. Revert "try to see if moving yaml is still necessary." 

    This reverts commit 68f14d3.
    @JPBergsma
    JPBergsma committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1d46e1b View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Added supported_prefixes field to config.py

    @JPBergsma
    JPBergsma committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    774be72 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/JPBergsma/optimade-python… 

    …-tools
    @JPBergsma
    JPBergsma committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    fac9b9b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    7d790b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Merge branch 'master' of https://github.com/JPBergsma/optimade-python… 

    …-tools
    @JPBergsma
    JPBergsma committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    2466fb1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into JPBergsma/add_metadata

    @JPBergsma
    JPBergsma committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    ff25f14 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Merging with master.

    @JPBergsma
    JPBergsma committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    44d8789 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Update requirements-client.txt (Materials-Consortia#1813) 

    removed duplicate requirement
    @JPBergsma @ml-evs
    JPBergsma authored and ml-evs committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    4ef9991 View commit details
    Browse the repository at this point in the history

  2. Modernize all Python 3.8 annotations (Materials-Consortia#1815) 

    * Use Python 3.9 as the 'base' CI version for linting

* Update pre-commit hooks

* Run `pyupgrade --py39-plus` to upgrade legacy annotations

* Add `--exit-non-zero-on-fix` for ruff

Co-authored-by: Casper Welzel Andersen <[email protected]>

* Use f-string over format

Co-authored-by: Casper Welzel Andersen <[email protected]>

---------

Co-authored-by: Casper Welzel Andersen <[email protected]>
    @ml-evs @CasperWA
    ml-evs and CasperWA committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    a3d1a5f View commit details
    Browse the repository at this point in the history

  3. Merge branch '0.25.x' into JPBergsma/add_metadata

    @ml-evs
    ml-evs authored Nov 6, 2023
    Configuration menu
    Copy the full SHA
    e3357d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Merge branch 'ml-evs/add-meta-to-entries' into JPBergsma/add_metadata

    @ml-evs
    ml-evs authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    6eac0a8 View commit details
    Browse the repository at this point in the history