Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ python:
before_script:
- yes | python setup.py install
- git clone https://github.com/uc-cdis/dictionaryutils
- cd dictionaryutils; git checkout feat/format_upgrade; cd ..


script:
- cd dictionaryutils; ./run_tests.sh; cd ..
Expand Down
32 changes: 16 additions & 16 deletions gdcdictionary/schemas/_definitions.yaml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
id: _definitions

UUID:
uuid:
term:
$ref: "_terms.yaml#/UUID"
$ref: "_terms.yaml#/uuid"
type: string
pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"

parent_uuids:
type: array
minItems: 1
items:
$ref: "#/UUID"
$ref: "#/uuid"
uniqueItems: true

foreign_key_project:
type: object
# Allow true here because we can have other unique keys defined on
# a target type
additionalProperties: true
# Can either use 'id' which are Gen3 IDs (UUID) or 'code'
# Can either use 'id' which are Gen3 IDs (uuid) or 'code'
# which is the user defined ID for project
properties:
id:
$ref: "#/UUID"
$ref: "#/uuid"
code:
type: string

Expand All @@ -48,11 +48,11 @@ foreign_key:
# Allow true here because we can have other unique keys defined on
# a target type
additionalProperties: True
# Can either use 'id' which are GDC IDs (UUID) or 'submitter_id'
# Can either use 'id' which are GDC IDs (uuid) or 'submitter_id'
# which are user defined IDs ("submitter IDs in the backend")
properties:
id:
$ref: "#/UUID"
$ref: "#/uuid"
submitter_id:
type: string

Expand Down Expand Up @@ -88,7 +88,7 @@ file_name:

file_size:
type: integer
term:
term:
$ref: "_terms.yaml#/file_size"

file_format:
Expand Down Expand Up @@ -135,7 +135,7 @@ data_file_error_type:

state:
term:
$ref: "_terms.yaml#/state"
$ref: "_terms.yaml#/state"
default: validated
downloadable:
- uploaded
Expand Down Expand Up @@ -166,7 +166,7 @@ state:

file_state:
term:
$ref: "_terms.yaml#/file_state"
$ref: "_terms.yaml#/file_state"
default: registered
enum:
- registered
Expand Down Expand Up @@ -195,7 +195,7 @@ project_id:

data_file_properties:
id:
$ref: "#/UUID"
$ref: "#/uuid"
systemAlias: node_id
submitter_id:
type:
Expand All @@ -211,7 +211,7 @@ data_file_properties:
file_size:
$ref: "#/file_size"
md5sum:
$ref: "#/md5sum"
$ref: "#/md5sum"
file_state:
$ref: "#/file_state"
object_id:
Expand All @@ -222,7 +222,7 @@ data_file_properties:
$ref: "#/data_file_error_type"
state_comment:
type: string
description: >
description: >
Optional comment about why the file is in the
current state, mainly for invalid state.
project_id:
Expand All @@ -234,7 +234,7 @@ data_file_properties:

workflow_properties:
id:
$ref: "#/UUID"
$ref: "#/uuid"
systemAlias: node_id
submitter_id:
type:
Expand Down Expand Up @@ -264,14 +264,14 @@ ubiquitous_properties:
type:
type: string
id:
$ref: "#/UUID"
$ref: "#/uuid"
systemAlias: node_id
submitter_id:
type:
- string
description: >
A project-specific identifier for a node. This property is the calling card/nickname/alias for
a unit of submission. It can be used in place of the UUID for identifying or recalling a node.
a unit of submission. It can be used in place of the uuid for identifying or recalling a node.
state:
$ref: "#/state"
project_id:
Expand Down
Loading