From fd9d175a53a9ddd13a8a1b585cf1952e3353a333 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Wed, 15 Aug 2018 15:28:48 +0200 Subject: [PATCH 1/4] Update live code [ci skip] --- website/_harp.json | 2 +- website/assets/js/main.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/_harp.json b/website/_harp.json index aeb4db232..58316d681 100644 --- a/website/_harp.json +++ b/website/_harp.json @@ -85,7 +85,7 @@ ], "V_CSS": "2.2.1", - "V_JS": "2.2.2", + "V_JS": "2.2.3", "DEFAULT_SYNTAX": "python", "ANALYTICS": "UA-58931649-1", "MAILCHIMP": { diff --git a/website/assets/js/main.js b/website/assets/js/main.js index 278906f50..529840847 100644 --- a/website/assets/js/main.js +++ b/website/assets/js/main.js @@ -49,6 +49,7 @@ import initUniverse from './universe.vue.js'; if (window.Juniper) { new Juniper({ repo: 'ines/spacy-io-binder', + branch: 'live', storageExpire: 60 }); } From 03f661fefb1a9bd37bfa33b5f920b0169dd3d0e3 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Thu, 16 Aug 2018 16:51:56 +0200 Subject: [PATCH 2/4] Add Greek to models directory [ci skip] --- website/models/_data.json | 3 +++ website/models/el.jade | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 website/models/el.jade diff --git a/website/models/_data.json b/website/models/_data.json index 9de4ff31c..734b2eb14 100644 --- a/website/models/_data.json +++ b/website/models/_data.json @@ -12,6 +12,7 @@ "French": "fr", "Italian": "it", "Dutch": "nl", + "Greek": "el", "Multi-Language": "xx" } }, @@ -46,6 +47,7 @@ "fr": ["fr_core_news_sm", "fr_core_news_md"], "it": ["it_core_news_sm"], "nl": ["nl_core_news_sm"], + "el": ["el_core_news_sm", "el_core_news_md"], "xx": ["xx_ent_wiki_sm"] }, @@ -83,6 +85,7 @@ "CC BY-SA 4.0": "https://creativecommons.org/licenses/by-sa/4.0/", "CC BY-NC": "https://creativecommons.org/licenses/by-nc/3.0/", "CC BY-NC 3.0": "https://creativecommons.org/licenses/by-nc/3.0/", + "CC BY-NC 4.0": "https://creativecommons.org/licenses/by-nc/4.0/", "CC-BY-NC-SA 3.0": "https://creativecommons.org/licenses/by-nc-sa/3.0/", "GPL": "https://www.gnu.org/licenses/gpl.html", "LGPL": "https://www.gnu.org/licenses/lgpl.html" diff --git a/website/models/el.jade b/website/models/el.jade new file mode 100644 index 000000000..901ce80e1 --- /dev/null +++ b/website/models/el.jade @@ -0,0 +1,6 @@ +//- 💫 DOCS > MODELS > EL + +include ../_includes/_mixins + +//- This is a placeholder. The page is rendered via the template at +//- /_includes/_page-model.jade. From c0fa9903f4ca6a6996c7adefa3476cb66a0174e7 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Thu, 16 Aug 2018 16:54:50 +0200 Subject: [PATCH 3/4] Update model directory JS [ci skip] Prevent the default release URL from being overwritten and add license type --- website/_harp.json | 2 +- website/assets/js/models.vue.js | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/website/_harp.json b/website/_harp.json index 58316d681..f866c554d 100644 --- a/website/_harp.json +++ b/website/_harp.json @@ -85,7 +85,7 @@ ], "V_CSS": "2.2.1", - "V_JS": "2.2.3", + "V_JS": "2.2.4", "DEFAULT_SYNTAX": "python", "ANALYTICS": "UA-58931649-1", "MAILCHIMP": { diff --git a/website/assets/js/models.vue.js b/website/assets/js/models.vue.js index abd8cf101..2b5f53973 100644 --- a/website/assets/js/models.vue.js +++ b/website/assets/js/models.vue.js @@ -10,6 +10,7 @@ export default function(repo) { 'CC BY-SA 4.0': 'https://creativecommons.org/licenses/by-sa/4.0/', 'CC BY-NC': 'https://creativecommons.org/licenses/by-nc/3.0/', 'CC BY-NC 3.0': 'https://creativecommons.org/licenses/by-nc/3.0/', + 'CC BY-NC 4.0': 'https://creativecommons.org/licenses/by-nc/4.0/', 'CC-BY-NC-SA 3.0': 'https://creativecommons.org/licenses/by-nc-sa/3.0/', 'GPL': 'https://www.gnu.org/licenses/gpl.html', 'LGPL': 'https://www.gnu.org/licenses/lgpl.html', @@ -33,8 +34,8 @@ export default function(repo) { version: 'n/a', notes: null, sizeFull: null, + fullName: null, pipeline: null, - releaseUrl: null, description: null, license: null, author: null, @@ -61,6 +62,10 @@ export default function(repo) { }, hasAccuracy() { return this.uas || this.las || this.tags_acc || this.ents_f || this.ents_p || this.ents_r; + }, + releaseUrl() { + const baseUrl = `${this.repo}/releases`; + return `${baseUrl}/${this.fullName ? `/tag/${this.fullName}` : ''}` } }, beforeMount() { @@ -78,9 +83,8 @@ export default function(repo) { }, methods: { $_updateData(data) { - const fullName = `${data.lang}_${data.name}-${data.version}`; + this.fullName = `${data.lang}_${data.name}-${data.version}`; this.version = data.version; - this.releaseUrl = `${this.repo}/releases/tag/${fullName}`; this.sizeFull = data.size; this.pipeline = data.pipeline; this.notes = data.notes; From aeb49eb62528ee7d42b343bf6ff3b09cf3e2c3ed Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Thu, 16 Aug 2018 16:56:02 +0200 Subject: [PATCH 4/4] Update version [ci skip] --- website/_harp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/_harp.json b/website/_harp.json index 56b35d449..a9b033b77 100644 --- a/website/_harp.json +++ b/website/_harp.json @@ -14,7 +14,7 @@ "MODELS_REPO": "explosion/spacy-models", "SPACY_VERSION": "2.1", - "BINDER_VERSION": "2.0.11", + "BINDER_VERSION": "2.0.12", "SOCIAL": { "twitter": "spacy_io",