subject to location

ga4gh · Sep 8, 2023 · 7847130 · 7847130
1 parent bd21446
commit 7847130
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/schema/defs/vrs/CopyNumber.rst b/schema/defs/vrs/CopyNumber.rst
@@ -40,7 +40,7 @@ Some CopyNumber attributes are inherited from :ref:`Ga4ghIdentifiableObject`.
           - string
           - 1..1
           - 
-       *  - subject
+       *  - location
           - gks.core:IRI | :ref:`Location`
           - 1..1
           - A location for which the number of systemic copies is described.
diff --git a/schema/defs/vrs/CopyNumberChange.rst b/schema/defs/vrs/CopyNumberChange.rst
@@ -40,7 +40,7 @@ Some CopyNumberChange attributes are inherited from :ref:`CopyNumber`.
           - string
           - 1..1
           - MUST be "CopyNumberChange"
-       *  - subject
+       *  - location
           - gks.core:IRI | :ref:`Location`
           - 1..1
           - A location for which the number of systemic copies is described.

diff --git a/schema/defs/vrs/CopyNumberCount.rst b/schema/defs/vrs/CopyNumberCount.rst
@@ -40,7 +40,7 @@ Some CopyNumberCount attributes are inherited from :ref:`CopyNumber`.
           - string
           - 1..1
           - MUST be "CopyNumberCount"
-       *  - subject
+       *  - location
           - gks.core:IRI | :ref:`Location`
           - 1..1
           - A location for which the number of systemic copies is described.

diff --git a/schema/merged.json b/schema/merged.json
@@ -242,7 +242,7 @@
                "default": "CopyNumberCount",
                "description": "MUST be \"CopyNumberCount\""
             },
-            "subject": {
+            "location": {
                "oneOf": [
                   {
                      "$ref": "#/$defs/SequenceLocation"
@@ -267,7 +267,7 @@
          },
          "required": [
             "copies",
-            "subject",
+            "location",
             "type"
          ],
          "additionalProperties": false
@@ -315,7 +315,7 @@
                "default": "CopyNumberChange",
                "description": "MUST be \"CopyNumberChange\""
             },
-            "subject": {
+            "location": {
                "oneOf": [
                   {
                      "$ref": "#/$defs/SequenceLocation"
@@ -343,7 +343,7 @@
          },
          "required": [
             "copyChange",
-            "subject",
+            "location",
             "type"
          ],
          "additionalProperties": false

diff --git a/schema/merged.yaml b/schema/merged.yaml
@@ -178,7 +178,7 @@ $defs:
         const: CopyNumberCount
         default: CopyNumberCount
         description: MUST be "CopyNumberCount"
-      subject:
+      location:
         oneOf:
         - $ref: '#/$defs/SequenceLocation'
         - $refCurie: gks.core:IRI
@@ -190,7 +190,7 @@ $defs:
         description: The integral number of copies of the subject in a system
     required:
     - copies
-    - subject
+    - location
     - type
     additionalProperties: false
   CopyNumberChange:
@@ -232,7 +232,7 @@ $defs:
         const: CopyNumberChange
         default: CopyNumberChange
         description: MUST be "CopyNumberChange"
-      subject:
+      location:
         oneOf:
         - $ref: '#/$defs/SequenceLocation'
         - $refCurie: gks.core:IRI
@@ -254,7 +254,7 @@ $defs:
           (low-level gain), "efo:0030072" (high-level gain).
     required:
     - copyChange
-    - subject
+    - location
     - type
     additionalProperties: false
   Genotype:

diff --git a/schema/vrs-source.yaml b/schema/vrs-source.yaml
@@ -234,13 +234,13 @@ $defs:
     description: >-
       A measure of the copies of a :ref:`Location` within a system (e.g. genome, cell, etc.)
     heritableProperties:
-      subject:
+      location:
         oneOf:
           - $refCurie: gks.core:IRI
           - $ref: "#/$defs/Location"
         description: >-
           A location for which the number of systemic copies is described.
-    heritableRequired: [ "subject" ]
+    heritableRequired: [ "location" ]
 
   CopyNumberCount:
     maturity: Alpha

diff --git a/schema/vrs.json b/schema/vrs.json
@@ -242,7 +242,7 @@
                "default": "CopyNumberCount",
                "description": "MUST be \"CopyNumberCount\""
             },
-            "subject": {
+            "location": {
                "oneOf": [
                   {
                      "$ref": "#/$defs/SequenceLocation"
@@ -267,7 +267,7 @@
          },
          "required": [
             "copies",
-            "subject",
+            "location",
             "type"
          ],
          "additionalProperties": false
@@ -315,7 +315,7 @@
                "default": "CopyNumberChange",
                "description": "MUST be \"CopyNumberChange\""
             },
-            "subject": {
+            "location": {
                "oneOf": [
                   {
                      "$ref": "#/$defs/SequenceLocation"
@@ -343,7 +343,7 @@
          },
          "required": [
             "copyChange",
-            "subject",
+            "location",
             "type"
          ],
          "additionalProperties": false

diff --git a/schema/vrs.yaml b/schema/vrs.yaml
@@ -178,7 +178,7 @@ $defs:
         const: CopyNumberCount
         default: CopyNumberCount
         description: MUST be "CopyNumberCount"
-      subject:
+      location:
         oneOf:
         - $ref: '#/$defs/SequenceLocation'
         - $refCurie: gks.core:IRI
@@ -190,7 +190,7 @@ $defs:
         description: The integral number of copies of the subject in a system
     required:
     - copies
-    - subject
+    - location
     - type
     additionalProperties: false
   CopyNumberChange:
@@ -232,7 +232,7 @@ $defs:
         const: CopyNumberChange
         default: CopyNumberChange
         description: MUST be "CopyNumberChange"
-      subject:
+      location:
         oneOf:
         - $ref: '#/$defs/SequenceLocation'
         - $refCurie: gks.core:IRI
@@ -254,7 +254,7 @@ $defs:
           (low-level gain), "efo:0030072" (high-level gain).
     required:
     - copyChange
-    - subject
+    - location
     - type
     additionalProperties: false
   Genotype: