From 6415d9aef45809808dc601cb5e0b8d0748a3dd26 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 19 Aug 2020 10:02:50 +0200 Subject: [PATCH 01/26] prepare next dev version --- package.json | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 272e5c5..d31fee9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tdp_dummy", "description": "", "homepage": "https://phovea.caleydo.org", - "version": "8.0.0", + "version": "8.0.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -74,10 +74,10 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "^10.0.1" + "tdp_core": "github:datavisyn/tdp_core#develop" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#semver:^8.0.1" + "tdp_core": "github:Caleydo/ordino#develop" }, "devDependencies": { "@types/jest": "~26.0.5", diff --git a/requirements.txt b/requirements.txt index 3b2b590..185cf08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -tdp_core>=10.0.0,<11.0.0 +-e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core From d8b3bed5a6dfe2bcaab266b031ca0ad8c3719e01 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 19 Aug 2020 10:19:36 +0200 Subject: [PATCH 02/26] fix typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d31fee9..47d9988 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "tdp_core": "github:datavisyn/tdp_core#develop" }, "optionalDependencies": { - "tdp_core": "github:Caleydo/ordino#develop" + "ordino": "github:Caleydo/ordino#develop" }, "devDependencies": { "@types/jest": "~26.0.5", From 5b0f46c2c994cda9925370cc5dd0522b310f28f4 Mon Sep 17 00:00:00 2001 From: rumersdorfer <45141967+rumersdorfer@users.noreply.github.com> Date: Thu, 20 Aug 2020 14:15:45 +0200 Subject: [PATCH 03/26] Update .gitattributes --- .gitattributes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitattributes b/.gitattributes index 544c336..711da28 100644 --- a/.gitattributes +++ b/.gitattributes @@ -125,3 +125,10 @@ AUTHORS text # with the python modules ``pickle``, ``dbm.*``, # ``shelve``, ``marshal``, ``anydbm``, & ``bsddb`` # (among others). + + +# Mark compiled files as generated to hide them in PRs +/dist/** linguist-generated=true + +# Hide compiled files from git diff and auto-replace them when merging different branches +/dist/** -diff -merge From 1b6a1452debe11ab5ca3c3d4672a61877f9545ba Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 25 Nov 2020 15:26:31 +0100 Subject: [PATCH 04/26] update requirements and switch branches --- requirements.txt | 2 +- requirements_dev.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 185cf08..d02355d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core +-e git+https://github.com/datavisyn/tdp_core.git@vstoiber/update_requirements#egg=tdp_core diff --git a/requirements_dev.txt b/requirements_dev.txt index f34272b..10476e2 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,6 +1,6 @@ -flake8==3.7.9 -pep8-naming==0.9.1 -pytest==5.3.5 +flake8==3.8.4 +pep8-naming==0.11.1 +pytest==6.1.2 pytest-runner==5.2 -Sphinx==2.4.2 +Sphinx==3.3.1 recommonmark==0.6.0 From 38bee08ce03c7e4dbd8677599283d9520aa3340d Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 10:47:22 +0100 Subject: [PATCH 05/26] switch branches in package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 47d9988..be87271 100644 --- a/package.json +++ b/package.json @@ -74,10 +74,10 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#develop" + "tdp_core": "github:datavisyn/tdp_core#fontawesome-v5" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#develop" + "ordino": "github:Caleydo/ordino#fontawesome-v5" }, "devDependencies": { "@types/jest": "~26.0.5", From b55bd6d41c1d0c2ee80b473baab16f44922f8bcd Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 10:47:36 +0100 Subject: [PATCH 06/26] update scss structure --- dist/scss/abstracts/_mixins.scss | 0 dist/scss/abstracts/_variables.scss | 0 dist/scss/base/_base.scss | 0 dist/scss/{ => components}/_idtype_color.scss | 0 dist/scss/main.scss | 11 +++++++---- src/scss/abstracts/_mixins.scss | 0 src/scss/abstracts/_variables.scss | 0 src/scss/base/_base.scss | 0 src/scss/{ => components}/_idtype_color.scss | 0 src/scss/main.scss | 11 +++++++---- 10 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 dist/scss/abstracts/_mixins.scss create mode 100644 dist/scss/abstracts/_variables.scss create mode 100644 dist/scss/base/_base.scss rename dist/scss/{ => components}/_idtype_color.scss (100%) create mode 100644 src/scss/abstracts/_mixins.scss create mode 100644 src/scss/abstracts/_variables.scss create mode 100644 src/scss/base/_base.scss rename src/scss/{ => components}/_idtype_color.scss (100%) diff --git a/dist/scss/abstracts/_mixins.scss b/dist/scss/abstracts/_mixins.scss new file mode 100644 index 0000000..e69de29 diff --git a/dist/scss/abstracts/_variables.scss b/dist/scss/abstracts/_variables.scss new file mode 100644 index 0000000..e69de29 diff --git a/dist/scss/base/_base.scss b/dist/scss/base/_base.scss new file mode 100644 index 0000000..e69de29 diff --git a/dist/scss/_idtype_color.scss b/dist/scss/components/_idtype_color.scss similarity index 100% rename from dist/scss/_idtype_color.scss rename to dist/scss/components/_idtype_color.scss diff --git a/dist/scss/main.scss b/dist/scss/main.scss index 1fbea77..1558b36 100644 --- a/dist/scss/main.scss +++ b/dist/scss/main.scss @@ -1,4 +1,7 @@ -/** - * Created by Samuel Gratzl on 16.12.2015 - */ -@import './idtype_color'; + @import "./abstracts/mixins"; + @import "./abstracts/variables"; + + @import "./base/base"; + + @import "./components/idtype_color"; + \ No newline at end of file diff --git a/src/scss/abstracts/_mixins.scss b/src/scss/abstracts/_mixins.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/scss/abstracts/_variables.scss b/src/scss/abstracts/_variables.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/scss/base/_base.scss b/src/scss/base/_base.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/scss/_idtype_color.scss b/src/scss/components/_idtype_color.scss similarity index 100% rename from src/scss/_idtype_color.scss rename to src/scss/components/_idtype_color.scss diff --git a/src/scss/main.scss b/src/scss/main.scss index 1fbea77..1558b36 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1,4 +1,7 @@ -/** - * Created by Samuel Gratzl on 16.12.2015 - */ -@import './idtype_color'; + @import "./abstracts/mixins"; + @import "./abstracts/variables"; + + @import "./base/base"; + + @import "./components/idtype_color"; + \ No newline at end of file From dbee92731ebf6e991b3fae586529f868cce25a66 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 10:50:01 +0100 Subject: [PATCH 07/26] use correct branches --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index be87271..90d1c3b 100644 --- a/package.json +++ b/package.json @@ -74,10 +74,10 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#fontawesome-v5" + "tdp_core": "github:datavisyn/tdp_core#dmoitzi/refactor_stylesheets_organiation_and_imports" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#fontawesome-v5" + "ordino": "github:Caleydo/ordino#dmoitzi/refactor_stylesheets_organiation_and_imports" }, "devDependencies": { "@types/jest": "~26.0.5", From d52266969391a5a292d19237fb554df38a08a232 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 10:53:17 +0100 Subject: [PATCH 08/26] remove import --- dist/scss/components/_idtype_color.scss | 2 -- src/scss/components/_idtype_color.scss | 2 -- 2 files changed, 4 deletions(-) diff --git a/dist/scss/components/_idtype_color.scss b/dist/scss/components/_idtype_color.scss index 715f38e..ad42aa6 100644 --- a/dist/scss/components/_idtype_color.scss +++ b/dist/scss/components/_idtype_color.scss @@ -1,5 +1,3 @@ -@import "~tdp_core/dist/scss/idtype_color"; - * { @include idtype_color('IDTypeA', #73dbff); @include idtype_color('IDTypeB', #ff82a0); diff --git a/src/scss/components/_idtype_color.scss b/src/scss/components/_idtype_color.scss index 715f38e..ad42aa6 100644 --- a/src/scss/components/_idtype_color.scss +++ b/src/scss/components/_idtype_color.scss @@ -1,5 +1,3 @@ -@import "~tdp_core/dist/scss/idtype_color"; - * { @include idtype_color('IDTypeA', #73dbff); @include idtype_color('IDTypeB', #ff82a0); From 9b7e15713bbabd5ab9d502ea9f751328c276df98 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 10:54:19 +0100 Subject: [PATCH 09/26] change order --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index be87271..11a7b30 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,6 @@ "dependencies": { "tdp_core": "github:datavisyn/tdp_core#fontawesome-v5" }, - "optionalDependencies": { - "ordino": "github:Caleydo/ordino#fontawesome-v5" - }, "devDependencies": { "@types/jest": "~26.0.5", "identity-obj-proxy": "~3.0.0", @@ -91,5 +88,8 @@ "tslint": "~5.20.1", "typedoc": "~0.17.8", "typescript": "~3.9.7" + }, + "optionalDependencies": { + "ordino": "github:Caleydo/ordino#fontawesome-v5" } } From de70f92de822a65e0b00e3bb746b5b271da4f56e Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 10:56:09 +0100 Subject: [PATCH 10/26] change order --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 90d1c3b..0e45e00 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,6 @@ "dependencies": { "tdp_core": "github:datavisyn/tdp_core#dmoitzi/refactor_stylesheets_organiation_and_imports" }, - "optionalDependencies": { - "ordino": "github:Caleydo/ordino#dmoitzi/refactor_stylesheets_organiation_and_imports" - }, "devDependencies": { "@types/jest": "~26.0.5", "identity-obj-proxy": "~3.0.0", @@ -91,5 +88,8 @@ "tslint": "~5.20.1", "typedoc": "~0.17.8", "typescript": "~3.9.7" + }, + "optionalDependencies": { + "ordino": "github:Caleydo/ordino#dmoitzi/refactor_stylesheets_organiation_and_imports" } } From 8702d0e235b71b88382cc3479eb5ef2180e1ec2d Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 21 Dec 2020 10:56:44 +0100 Subject: [PATCH 11/26] remove import --- dist/scss/components/_idtype_color.scss | 2 -- src/scss/components/_idtype_color.scss | 2 -- 2 files changed, 4 deletions(-) diff --git a/dist/scss/components/_idtype_color.scss b/dist/scss/components/_idtype_color.scss index 715f38e..ad42aa6 100644 --- a/dist/scss/components/_idtype_color.scss +++ b/dist/scss/components/_idtype_color.scss @@ -1,5 +1,3 @@ -@import "~tdp_core/dist/scss/idtype_color"; - * { @include idtype_color('IDTypeA', #73dbff); @include idtype_color('IDTypeB', #ff82a0); diff --git a/src/scss/components/_idtype_color.scss b/src/scss/components/_idtype_color.scss index 715f38e..ad42aa6 100644 --- a/src/scss/components/_idtype_color.scss +++ b/src/scss/components/_idtype_color.scss @@ -1,5 +1,3 @@ -@import "~tdp_core/dist/scss/idtype_color"; - * { @include idtype_color('IDTypeA', #73dbff); @include idtype_color('IDTypeB', #ff82a0); From e8c1db72cc49bc575e5016af6475c879680cdd86 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Mon, 28 Dec 2020 13:37:28 +0100 Subject: [PATCH 12/26] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0e45e00..f324f87 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#dmoitzi/refactor_stylesheets_organiation_and_imports" + "tdp_core": "github:datavisyn/tdp_core#develop" }, "devDependencies": { "@types/jest": "~26.0.5", @@ -90,6 +90,6 @@ "typescript": "~3.9.7" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#dmoitzi/refactor_stylesheets_organiation_and_imports" + "ordino": "github:Caleydo/ordino#develop" } } From 6d6ac41e6b9adb66b781f3efc2e457aa89ce5410 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:00:37 +0100 Subject: [PATCH 13/26] update deprecated config option --- jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index 8024c72..3a68180 100644 --- a/jest.config.js +++ b/jest.config.js @@ -38,7 +38,7 @@ module.exports = { "__APP_CONTEXT__": "TEST_CONTEXT", // has to be set to true, otherwise i18n import fails "ts-jest": { - "tsConfig": { + "tsconfig": { "esModuleInterop": true } } From c28503a2603c6b7b202982a57fa859fea843ed79 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:00:45 +0100 Subject: [PATCH 14/26] update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8d6a52a..632304a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ /.tscache /.idea /build/ +/dist/ +/tsBuildInfoFile/ *.egg-info/ *.egg *.py[cod] From 03fb034061dad1e58790eaecc213f7f030b5f8b4 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:00:54 +0100 Subject: [PATCH 15/26] update tsconfig.json --- tsconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index e7bc9b2..2e06f21 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,9 @@ "esModuleInterop": false, "resolveJsonModule": true, "allowSyntheticDefaultImports": true, - "preserveWatchOutput": true + "preserveWatchOutput": true, + "incremental": true, + "tsBuildInfoFile": "dist/tsBuildInfoFile" }, "include": [ "src/**/*.ts", From 575da528c1007ac91a4adc92ba5496134b0bf17b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:01:16 +0100 Subject: [PATCH 16/26] switch branches in package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f324f87..2dea8bb 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#develop" + "tdp_core": "github:datavisyn/tdp_core#vstoiber/update_requirements" }, "devDependencies": { "@types/jest": "~26.0.5", @@ -90,6 +90,6 @@ "typescript": "~3.9.7" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#develop" + "ordino": "github:Caleydo/ordino#vstoiber/update_requirements" } } From 1dc79134e41ad7e2eb2958ef80f25c04b70bcf7c Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:01:24 +0100 Subject: [PATCH 17/26] update dependencies --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2dea8bb..f2ccb02 100644 --- a/package.json +++ b/package.json @@ -77,16 +77,16 @@ "tdp_core": "github:datavisyn/tdp_core#vstoiber/update_requirements" }, "devDependencies": { - "@types/jest": "~26.0.5", + "@types/jest": "~26.0.20", "identity-obj-proxy": "~3.0.0", - "jest": "~26.1.0", + "jest": "~26.6.3", "jest-raw-loader": "~1.0.1", "rimraf": "~3.0.2", - "shx": "~0.3.2", - "ts-jest": "~26.1.3", - "tslib": "~2.0.0", + "shx": "~0.3.3", + "ts-jest": "~26.4.4", + "tslib": "~2.0.3", "tslint": "~5.20.1", - "typedoc": "~0.17.8", + "typedoc": "~0.19.2", "typescript": "~3.9.7" }, "optionalDependencies": { From 062c9ff9eecbaf3f850c1bdc2cc4f96b61626308 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 12 Jan 2021 09:19:36 +0100 Subject: [PATCH 18/26] update .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 632304a..fd3fcc7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,7 @@ /.tscache /.idea /build/ -/dist/ -/tsBuildInfoFile/ +/dist/tsBuildInfoFile *.egg-info/ *.egg *.py[cod] From 15f812d29f2e1516b92fe44de7e171b405a42e95 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Sat, 23 Jan 2021 13:10:18 +0100 Subject: [PATCH 19/26] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f2ccb02..993e4cf 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#vstoiber/update_requirements" + "tdp_core": "github:datavisyn/tdp_core#develop" }, "devDependencies": { "@types/jest": "~26.0.20", @@ -90,6 +90,6 @@ "typescript": "~3.9.7" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#vstoiber/update_requirements" + "ordino": "github:Caleydo/ordino#develop" } } From 422c914310a83a412a8693facaba347696942522 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Sat, 23 Jan 2021 13:10:33 +0100 Subject: [PATCH 20/26] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d02355d..185cf08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e git+https://github.com/datavisyn/tdp_core.git@vstoiber/update_requirements#egg=tdp_core +-e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core From d3c016ed82063a449a4cd697fbe3825a03ab377f Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 26 Jan 2021 15:19:32 +0100 Subject: [PATCH 21/26] prepare release_9.0.0 --- package.json | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 993e4cf..352804f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tdp_dummy", "description": "", "homepage": "https://phovea.caleydo.org", - "version": "8.0.1-SNAPSHOT", + "version": "9.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -74,7 +74,7 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#develop" + "tdp_core": "^release-11.0.0" }, "devDependencies": { "@types/jest": "~26.0.20", @@ -90,6 +90,6 @@ "typescript": "~3.9.7" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#develop" + "ordino": "github:Caleydo/ordino#semver:^release-9.0.0" } } diff --git a/requirements.txt b/requirements.txt index 185cf08..3b28ff5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core +tdp_core>=release-11.0.0, Date: Tue, 26 Jan 2021 15:21:32 +0100 Subject: [PATCH 22/26] fix branches --- package.json | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 352804f..9b90f0d 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "^release-11.0.0" + "tdp_core": "github:datavisyn/tdp_core#release-11.0.0" }, "devDependencies": { "@types/jest": "~26.0.20", @@ -90,6 +90,6 @@ "typescript": "~3.9.7" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#semver:^release-9.0.0" + "ordino": "github:Caleydo/ordino#release-9.0.0" } } diff --git a/requirements.txt b/requirements.txt index 3b28ff5..dfb4e6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -tdp_core>=release-11.0.0, Date: Fri, 12 Feb 2021 18:28:20 +0100 Subject: [PATCH 23/26] Update config.yml --- .circleci/config.yml | 167 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 135 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2740dfa..4531c5f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,18 @@ -version: 2 -jobs: - build: - working_directory: ~/phovea +version: 2.1 + +executors: + python-executor: + working_directory: ~/phovea-python docker: - image: circleci/python:3.7-buster-node-browsers # for node version see Dockerfile on https://hub.docker.com/r/circleci/python + node-executor: + working_directory: ~/phovea-web + docker: + - image: circleci/node:12.13-buster-browsers + +jobs: + python-build: + executor: python-executor steps: - checkout - run: @@ -20,25 +29,6 @@ jobs: name: Install Docker packages from docker_packages.txt command: | (!(test -f docker_packages.txt) || (cat docker_packages.txt | xargs sudo apt-get install -y)) - - restore_cache: - key: deps2-{{ .Branch }}-{{ checksum "package.json" }} - - run: - name: Install npm dependencies - command: npm install - - run: - name: Remove npm dependencies installed from git repositories (avoid caching of old commits) - command: | - (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf - - save_cache: - key: deps2-{{ .Branch }}-{{ checksum "package.json" }} - paths: - - ./node_modules - - run: - name: Install npm dependencies from git repositories (always get latest commit) - command: npm install - - run: - name: Show installed npm dependencies - command: npm list --depth=1 || true - restore_cache: key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }} - run: @@ -60,16 +50,96 @@ jobs: - run: name: Show installed pip packages command: pip list || true + - run: + name: Remove all from dist folder + command: | + rm -rf dist && mkdir dist - run: name: Build command: | . ~/venv/bin/activate - npm run dist + npm run dist:python - store_artifacts: path: dist - destination: dist + destination: dist-python + - persist_to_workspace: + root: ~/. + paths: phovea-python + python-publish: + executor: python-executor + steps: + - attach_workspace: + at: ~/. + - run: ls -a + - run: + name: Install twine + command: | + virtualenv ~/venv + . ~/venv/bin/activate + pip install twine + - run: + name: Authentication + command: | + echo -e "[pypi]" >> ~/.pypirc + echo -e "repository = $PYPI_REPOSITORY" >> ~/.pypirc + echo -e "username = $PYPI_USERNAME" >> ~/.pypirc + echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc + - run: + name: Publish package + command: | + . ~/venv/bin/activate + twine upload dist/* + web-build: + executor: node-executor + steps: + - checkout + - run: + name: Show Node.js and npm version + command: | + node -v + npm -v + - restore_cache: + key: deps1-{{ .Branch }}-{{ checksum "package.json" }} + - run: + name: Install npm dependencies + command: npm install + - run: + name: Remove npm dependencies installed from git repositories (avoid caching of old commits) + command: | + (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf + - save_cache: + key: deps1-{{ .Branch }}-{{ checksum "package.json" }} + paths: ./node_modules + - run: + name: Install npm dependencies from git repositories (always get latest commit) + command: npm install + - run: + name: Show installed npm dependencies + command: npm list --depth=1 || true + - run: + name: Build + command: npm run dist:web + - store_artifacts: + path: dist + destination: dist-web + - persist_to_workspace: + root: ~/. + paths: phovea-web + web-publish: + executor: node-executor + steps: + - attach_workspace: + at: ~/. + - run: ls -a + - run: + name: Authentication + command: | + echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc + - run: + name: Publish package + command: npm publish workflows: - version: 2 + version: 2.1 # build-nightly: # triggers: # - schedule: @@ -79,18 +149,51 @@ workflows: # only: # - develop # jobs: -# - build - build-branch: +# - python-build +# - web-build + build-branches-only: jobs: - - build: + - python-build: filters: tags: - ignore: /^v.*/ - build-tag: + ignore: /.*/ + - web-build: + filters: + tags: + ignore: /.*/ + build-publish-tag: jobs: - - build: + - python-build: + filters: + branches: + ignore: /.*/ + tags: + only: /^v.*/ + - web-build: filters: branches: ignore: /.*/ tags: only: /^v.*/ + - python-publish: + context: + - org-public + requires: + - python-build + - web-build + filters: + branches: + ignore: /.*/ + tags: + only: /^v.*/ + - web-publish: + context: + - org-public + requires: + - python-build + - web-build + filters: + branches: + ignore: /.*/ + tags: + only: /^v.*/ From 049f489c93852f18521f4e25bdbf75ec72b24c16 Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Fri, 12 Feb 2021 18:31:29 +0100 Subject: [PATCH 24/26] changes for release 9.0.0 --- package.json | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9b90f0d..2476db6 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#release-11.0.0" + "tdp_core": "^11.0.0" }, "devDependencies": { "@types/jest": "~26.0.20", diff --git a/requirements.txt b/requirements.txt index dfb4e6f..5cf2b6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e git+https://github.com/datavisyn/tdp_core.git@release-11.0.0#egg=tdp_core \ No newline at end of file +tdp_core>=11.0.0,<12.0.0 \ No newline at end of file From d13f511c56bfc84929869dbac3f7f00eb6becb17 Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Fri, 12 Feb 2021 18:51:26 +0100 Subject: [PATCH 25/26] changes for release 9.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2476db6..6be42ab 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,6 @@ "typescript": "~3.9.7" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#release-9.0.0" + "ordino": "github:Caleydo/ordino#9.0.0" } } From a734c4cf64c7a57a48f5af208d40e02ba6e13d5b Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Fri, 12 Feb 2021 19:01:39 +0100 Subject: [PATCH 26/26] changes for release 9.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6be42ab..5478e35 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,6 @@ "typescript": "~3.9.7" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#9.0.0" + "ordino": "github:Caleydo/ordino#semver:^9.0.0" } }