Skip to content

Commit

Permalink
Merge pull request #296 from bible-technology/develop
Browse files Browse the repository at this point in the history
Release 1.0.0-rc2
  • Loading branch information
jtauber authored Jun 16, 2022
2 parents 8a02ca5 + d868561 commit c68418a
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 16 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
# The short X.Y version.
version = u'1.0.0'
# The full version, including alpha/beta/rc tags.
release = u'1.0.0-rc1'
release = u'1.0.0-rc2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/audioTranslation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"format": "scripture burrito",
"meta": {
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"category": "source",
"generator": {
"softwareName": "DBLImport",
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/embossedBrailleScripture.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"format": "scripture burrito",
"meta": {
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"category": "source",
"generator": {
"softwareName": "DBLImport",
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/minimalTemplate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"format": "scripture burrito",
"meta": {
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"category": "template",
"templateName": {
"en": "A Minimal and Frankly Pointless Template"
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/signLanguageVideoTranslation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"format": "scripture burrito",
"meta": {
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"category": "source",
"generator": {
"softwareName": "DBLImport",
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/textStories.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"format": "scripture burrito",
"meta": {
"category": "source",
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"dateCreated": "2020-03-31T09:04:10.3+02:00",
"generator": {
"softwareName": "SB01Import",
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/textTranslation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"format": "scripture burrito",
"meta": {
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"category": "source",
"generator": {
"softwareName": "DBLImport",
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/textTranslation_derived.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"format": "scripture burrito",
"meta": {
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"category": "derived",
"dateCreated": "2019-02-19T01:02:03+01:00",
"generator": {
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/typesetScripture.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"format": "scripture burrito",
"meta": {
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"category": "source",
"generator": {
"softwareName": "DBLImport",
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/wordAlignment.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"format": "scripture burrito",
"meta": {
"category": "source",
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"dateCreated": "2020-03-31T09:04:10.3+02:00",
"generator": {
"softwareName": "Autographa-Aligner 0.1.0",
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/artifacts/xScripture.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"format": "scripture burrito",
"meta": {
"category": "source",
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"dateCreated": "2020-03-31T09:04:10.3+02:00",
"generator": {
"softwareName": "SB01Import",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scripture-burrito",
"version": "1.0.0-rc1",
"version": "1.0.0-rc2",
"description": "Schema support for Scripture Burrito",
"main": "schema/index.js",
"directories": {
Expand Down
6 changes: 5 additions & 1 deletion schema/derived_metadata.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"type": "object",
"description": "Scripture Burrito derived variant root.",
"properties": {
"format": {
"type": "string",
"enum": ["scripture burrito"]
},
"meta": {
"$ref": "derived_meta.schema.json"
},
Expand Down Expand Up @@ -49,7 +53,7 @@
"$ref": "recipe.schema.json"
}
},
"required": ["meta", "idAuthorities", "identification", "confidential", "copyright", "type", "recipe"],
"required": ["format", "meta", "idAuthorities", "identification", "confidential", "copyright", "type", "recipe"],
"additionalProperties": false,
"if": {
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion schema/meta_version.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"$$target": "meta_version.schema.json",
"title": "Meta Version",
"type": "string",
"enum": ["1.0.0-rc1"],
"enum": ["1.0.0-rc2"],
"description": "Version of the Scripture Burrito specification this file follows."
}
6 changes: 5 additions & 1 deletion schema/source_metadata.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"type": "object",
"description": "Scripture Burrito source kinda-variant root.",
"properties": {
"format": {
"type": "string",
"enum": ["scripture burrito"]
},
"meta": {
"$ref": "source_meta.schema.json"
},
Expand Down Expand Up @@ -46,7 +50,7 @@
"$ref": "progress.schema.json"
}
},
"required": ["meta", "idAuthorities", "identification", "confidential", "type", "copyright", "ingredients"],
"required": ["format", "meta", "idAuthorities", "identification", "confidential", "type", "copyright", "ingredients"],
"additionalProperties": false,
"allOf": [
{
Expand Down
6 changes: 5 additions & 1 deletion schema/template_metadata.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"type": "object",
"description": "Scripture Burrito Template root.",
"properties": {
"format": {
"type": "string",
"enum": ["scripture burrito"]
},
"meta": {
"$ref": "template_meta.schema.json"
},
Expand Down Expand Up @@ -43,7 +47,7 @@
"$ref": "localized_names.schema.json"
}
},
"required": ["meta", "copyright"],
"required": ["format", "meta", "copyright"],
"additionalProperties": false,
"allOf": [
{
Expand Down

0 comments on commit c68418a

Please sign in to comment.