Merge branch 'master' into rdf-spec

Author: gouttegd

.github/workflows/pypi-publish.yaml

@@ -3,8 +3,8 @@ name: Publish Python Package
 
 on:
   release:
-    # Trigger the workflow only for real releases but not for draft releases
-    types: [created]
+    # Run when a release is published or a prerelease is published (not on draft creation)
+    types: [published]
 
 jobs:
   build:
@@ -54,7 +54,7 @@ jobs:
           path: dist
 
       - name: Publish package 📦 to PyPI
-        if: github.event_name == 'release'
         uses: pypa/[email protected]
         with:
-          verbose: true
+          verbose: true
+          skip-existing: true

CHANGELOG.md

@@ -16,6 +16,7 @@
 - Add `cardinality_scope` slot ([issue](https://github.com/mapping-commons/sssom/issues/467)).
 - Add new value `0:0` to the `mapping_cardinality_enum` ([issue](https://github.com/mapping-commons/sssom/issues/477)).
 - Add specification for the RDF serialisation ([discussion](https://github.com/mapping-commons/sssom/discussions/454)).
+- Development snapshots of SSSOM schema can now be released using GitHub's pre-release feature ([issue](https://github.com/mapping-commons/sssom/issues/490)).
 
 ## SSSOM version 1.0.0
 

CONTRIBUTING.md

@@ -18,6 +18,7 @@ The following is a set of guidelines for contributing to SSSOM. They are derived
   * [Your First Code Contribution](#your-first-code-contribution)
   * [Pull Requests](#pull-requests)
   * [Local Testing](#local-testing)
+  * [Making a release](#releasing)
 
 [Styleguides](#styleguides)
   * [Git Commit Messages](#git-commit-messages)
@@ -170,6 +171,34 @@ You may get a warning about “incompatible sssom-schema versions”; this is du
 $ poetry run tox -e py
 ```
 
+### Making a release
+
+<a id="releasing"></a>
+
+Before making a release, check that all the files that are derived from
+the LinkML schema are up-to-date. If they are not:
+
+* re-generate them by running `poetry run make all`;
+* commit all the files that were modified as a result of that
+  command.
+
+Update any other file as needed (e.g. changelog, README, copyright
+notices, etc.), and commit the corresponding changes.
+
+Once the repository is ready for a release, tag the head commit of the
+main branch with a version number tag. If the release is intended to be
+published on the Python Package Index (which it normally should), the
+version tag MUST be of the form `vVERSION` (`v` prefix followed by the
+actual intended version number).
+
+Push all changes to the main GitHub repository (including the tag), and
+create the release from the new tag.
+
+Be careful that any new release that bumps either the major or the minor
+version number, and that is not a _pre_ release, will be interpreted not
+merely as a new version of the `sssom_schema` Python package, but as a
+new version of the SSSOM specification!
+
 
 ## Styleguides
 

project/excel/sssom_schema.xlsx

@@ -1,4 +1,42 @@
 # metamodel_version: 1.7.0
+enum EntityTypeEnum
+  {
+    owl_class
+    owl_object_property
+    owl_data_property
+    owl_annotation_property
+    owl_named_individual
+    skos_concept
+    rdfs_resource
+    rdfs_class
+    rdfs_literal
+    rdfs_datatype
+    rdf_property
+    composed_entity_expression
+  }
+
+enum MappingCardinalityEnum
+  {
+    __1__COLON__1
+    __1__COLON__n
+    n__COLON__1
+    n__COLON__n
+    __1__COLON__0
+    __0__COLON__1
+    __0__COLON__0
+  }
+
+enum PredicateModifierEnum
+  {
+    Not
+  }
+
+enum SssomVersionEnum
+  {
+    __1__FULL_STOP__0
+    __1__FULL_STOP__1
+  }
+
 type ExtensionDefinition
   {
     slotName: Ncname!
@@ -8,6 +46,7 @@ type ExtensionDefinition
 
 type Mapping
   {
+    recordId: EntityReference
     subjectId: EntityReference
     subjectLabel: String
     subjectCategory: String
@@ -24,17 +63,20 @@ type Mapping
     reviewerLabel: [String]
     creatorId: [EntityReference]
     creatorLabel: [String]
-    license: Uri
+    license: NonRelativeURI
     subjectType: EntityTypeEnum
     subjectSource: EntityReference
     subjectSourceVersion: String
     objectType: EntityTypeEnum
     objectSource: EntityReference
     objectSourceVersion: String
-    mappingProvider: Uri
+    predicateType: EntityTypeEnum
+    mappingProvider: NonRelativeURI
     mappingSource: EntityReference
     mappingCardinality: MappingCardinalityEnum
+    cardinalityScope: [String]
     mappingTool: String
+    mappingToolId: EntityReference
     mappingToolVersion: String
     mappingDate: Date
     publicationDate: Date
@@ -48,7 +90,7 @@ type Mapping
     objectPreprocessing: [EntityReference]
     similarityScore: Double
     similarityMeasure: String
-    seeAlso: [String]
+    seeAlso: [NonRelativeURI]
     issueTrackerItem: EntityReference
     other: String
     comment: String
@@ -59,51 +101,59 @@ type MappingRegistry
     mappingRegistryId: EntityReference!
     mappingRegistryTitle: String
     mappingRegistryDescription: String
-    imports: [Uri]
+    imports: [NonRelativeURI]
     mappingSetReferences: [MappingSetReference]
-    documentation: Uri
-    homepage: Uri
-    issueTracker: Uri
+    documentation: NonRelativeURI
+    homepage: NonRelativeURI
+    issueTracker: NonRelativeURI
   }
 
 type MappingSet
   {
+    sssomVersion: SssomVersionEnum
     curieMap: [Prefix]
     mappings: [Mapping]
-    mappingSetId: Uri!
+    mappingSetId: NonRelativeURI!
     mappingSetVersion: String
-    mappingSetSource: [Uri]
+    mappingSetSource: [NonRelativeURI]
     mappingSetTitle: String
     mappingSetDescription: String
+    mappingSetConfidence: Double
     creatorId: [EntityReference]
     creatorLabel: [String]
-    license: Uri!
+    license: NonRelativeURI!
     subjectType: EntityTypeEnum
     subjectSource: EntityReference
     subjectSourceVersion: String
     objectType: EntityTypeEnum
     objectSource: EntityReference
     objectSourceVersion: String
-    mappingProvider: Uri
+    predicateType: EntityTypeEnum
+    mappingProvider: NonRelativeURI
+    cardinalityScope: [String]
     mappingTool: String
+    mappingToolId: EntityReference
     mappingToolVersion: String
     mappingDate: Date
     publicationDate: Date
     subjectMatchField: [EntityReference]
     objectMatchField: [EntityReference]
     subjectPreprocessing: [EntityReference]
     objectPreprocessing: [EntityReference]
-    seeAlso: [String]
-    issueTracker: Uri
+    similarityMeasure: String
+    curationRule: [EntityReference]
+    curationRuleText: [String]
+    seeAlso: [NonRelativeURI]
+    issueTracker: NonRelativeURI
     other: String
     comment: String
     extensionDefinitions: [ExtensionDefinition]
   }
 
 type MappingSetReference
   {
-    mappingSetId: Uri!
-    mirrorFrom: Uri
+    mappingSetId: NonRelativeURI!
+    mirrorFrom: NonRelativeURI
     registryConfidence: Double
     mappingSetGroup: String
     lastUpdated: Date
@@ -125,3 +175,8 @@ type Propagatable
     propagated: Boolean
   }
 
+type Versionable
+  {
+    addedIn: SssomVersionEnum
+  }
+