From 72ea27679ce83d546e9045db7373a0e1ca2eaf97 Mon Sep 17 00:00:00 2001 From: aditya-nath-sage Date: Mon, 14 Oct 2024 11:56:39 -0700 Subject: [PATCH 1/3] Update nf_research_tools.rdb.model.csv Removed investigator website from the schema csv for nf research tools central --- nf_research_tools.rdb.model.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/nf_research_tools.rdb.model.csv b/nf_research_tools.rdb.model.csv index 9f9a2d02..0eb2af6e 100644 --- a/nf_research_tools.rdb.model.csv +++ b/nf_research_tools.rdb.model.csv @@ -137,7 +137,6 @@ investigatorId,A unique identifier for the investigator.,,,TRUE,,investigator,,, orcid,The orcidId of the investigator that developed the resource,,,FALSE,,investigator,,, investigatorName,The name of the investigator responsible for devleoping the resource.,,,TRUE,,investigator,,, institution,The insitution of the investator,,,FALSE,,investigator,,, -investigatorWebsite,The url to the investigator's laboratory website corresponding to the resource.,,,FALSE,,investigator,,, investigatorSynapseId,The synapse identifier for the investigator.,,,FALSE,,investigator,,, publication,Initial publication associated with the resource.,,"Component, publicationId, publicationTitle, authors, abstract, journal, publicationDate, pmid, doi, citation, publicationDateUnix",FALSE,,publication,"publicationId, publicationTitle, authors, abstract, journal, publicationDate, pmid, doi, citation, publicationDateUnix",, publicationId,A unique identifier for the publication.,,,FALSE,,publication,,, From a3a3191d0bd469cebb180e3096e6f80de1d1c26d Mon Sep 17 00:00:00 2001 From: aditya-nath-sage Date: Mon, 14 Oct 2024 19:47:20 +0000 Subject: [PATCH 2/3] Got rid of investigatorWebsite within investigator --- nf_research_tools.rdb.model.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nf_research_tools.rdb.model.csv b/nf_research_tools.rdb.model.csv index 0eb2af6e..f64c76de 100644 --- a/nf_research_tools.rdb.model.csv +++ b/nf_research_tools.rdb.model.csv @@ -132,7 +132,7 @@ developmentId,A unique identifier for the development of the resource.,,,TRUE,,d funder,A person or organization that provides money for a particular resource.,,"Component, funderId, funderName",FALSE,,funder,"funderId, funderName",, funderId,A unique identifier for the funder of the resource.,,,FALSE,,funder,,, funderName,The name of the person or agency that funded the development of the resource.,,,FALSE,,funder,,, -investigator,A person who carries out a formal inquiry or investigation into the development of the resource.,,"Component, investigatorId, orcid, investigatorName, institution, investigatorWebsite, investigatorSynapseId",FALSE,,investigator,"investigatorId, orcid, investigatorName, institution, investigatorWebsite, investigatorSynapseId",, +investigator,A person who carries out a formal inquiry or investigation into the development of the resource.,,"Component, investigatorId, orcid, investigatorName, institution, investigatorSynapseId",FALSE,,investigator,"investigatorId, orcid, investigatorName, institution, investigatorSynapseId",, investigatorId,A unique identifier for the investigator.,,,TRUE,,investigator,,, orcid,The orcidId of the investigator that developed the resource,,,FALSE,,investigator,,, investigatorName,The name of the investigator responsible for devleoping the resource.,,,TRUE,,investigator,,, From 171ab6316f9c05e2c260a600354ccfe1d4780b4c Mon Sep 17 00:00:00 2001 From: Robert Allaway Date: Mon, 14 Oct 2024 15:02:58 -0500 Subject: [PATCH 3/3] Update schematic-schema-convert.yml --- .github/workflows/schematic-schema-convert.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/schematic-schema-convert.yml b/.github/workflows/schematic-schema-convert.yml index 9e806519..c450a0de 100644 --- a/.github/workflows/schematic-schema-convert.yml +++ b/.github/workflows/schematic-schema-convert.yml @@ -12,7 +12,8 @@ on: env: schema_filename: nf_research_tools.rdb.model.csv - + SCHEMATIC_VERSION: 24.7.2 # please update .devcontainer as well until this can be set globally somewhere... + jobs: build: runs-on: ubuntu-22.04 @@ -28,13 +29,18 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token. fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository - - - name: Install schematic and convert schema #temporarily revert to this to use edge version of schematic - shell: bash + + # Set up supported python. + - uses: actions/setup-python@v5 + with: + python-version: '3.10.12' + + - name: Setup schematic and do another convert pass + id: schematic-convert run: | - pip install schematicpy + pip install schematicpy==$SCHEMATIC_VERSION + pip show schematicpy schematic schema convert $schema_filename -o nf-research-tools.jsonld - - name: Commit files run: |