Skip to content

Merge Berkeley schema (berkeley-schema-fy24/main) into Legacy schema (nmdc-schema/main)#2195

Merged
turbomam merged 1438 commits intomainfrom
resolve-merge-conflict-in-nmdc.py
Oct 7, 2024
Merged

Merge Berkeley schema (berkeley-schema-fy24/main) into Legacy schema (nmdc-schema/main)#2195
turbomam merged 1438 commits intomainfrom
resolve-merge-conflict-in-nmdc.py

Conversation

@turbomam
Copy link
Member

@turbomam turbomam commented Oct 7, 2024

In this PR, we merged the "Berkeley schema" fork into the "Legacy schema" upstream.

Before doing that, we created a GitHub Release in each of those repositories, for future reference:

  • nmdc-schema v10.9.1
  • berkeley-schema-fy24 v11.0.0rc24

mslarae13 added 30 commits June 26, 2024 11:47
@turbomam turbomam closed this Oct 7, 2024
@turbomam turbomam reopened this Oct 7, 2024
@turbomam
Copy link
Member Author

turbomam commented Oct 7, 2024

https://github.com/microbiomedata/nmdc-schema/actions/runs/11222631410 failed because building a documentation preview from a fork is not supported.

see

@turbomam turbomam marked this pull request as ready for review October 7, 2024 19:40
@eecavanna eecavanna changed the title merge berkeley-schema-fy24 into nmdc-schema Merge Berkeley schema (berkeley-schema-fy24/main) into Legacy schema (nmdc-schema/main) Oct 7, 2024
slot-range-type-reporter = "src.scripts.slot_range_type_reporter:cli"
get-study-id-from-filename = "src.scripts.get_study_id_from_filename:main"
database-to-json-list-files = "src.scripts.database_to_json_list_files:split_yaml_to_json"
date-created-blank-node = "src.scripts.date_created_blank_node:print_timestamp" # prints a RDF Tutrle string, for copying into other RDF/TTL files. may need some paramterizastion.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a typo in the word "Turtle". I don't consider this to be a deal-breaker given the task at hand.

@turbomam turbomam merged commit b2fe199 into microbiomedata:main Oct 7, 2024
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.

9 participants