From f9b7e6e92f06fa225273fe5aed9e349619923170 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 13 Jan 2020 16:15:14 +0100 Subject: [PATCH 01/18] Prepare next dev release --- package.json | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2fbc43f..842aaa5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tdp_dummy", "description": "", "homepage": "https://phovea.caleydo.org", - "version": "6.0.0", + "version": "6.0.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -73,10 +73,10 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#semver:^8.0.0" + "tdp_core": "github:datavisyn/tdp_core#develop" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#semver:^6.0.0" + "ordino": "github:Caleydo/ordino#develop" }, "devDependencies": { "@types/jasmine": "2.5.47", diff --git a/requirements.txt b/requirements.txt index f4b0ffd..185cf08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e git+https://github.com/datavisyn/tdp_core.git@v8.0.0#egg=tdp_core +-e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core From 46439cde15a3ea8579eedd9e177d6d084af73368 Mon Sep 17 00:00:00 2001 From: rumersdorfer <45141967+rumersdorfer@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:50:51 +0100 Subject: [PATCH 02/18] add CODEOWNERS file --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..9836a90 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @thinkh From e5965473646f1cddd5b66c254356f9faff9831cf Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 19 Feb 2020 07:28:06 +0100 Subject: [PATCH 03/18] set `"downlevelIteration": true` in ts config --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index ab4451b..3a54054 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,7 @@ "moduleResolution": "node", "jsx": "react", "experimentalDecorators": true, + "downlevelIteration": true, // required as long as target is `es5` "lib": [ "dom", "es2015", From c2027ff472bea3f116d6a60f703035bdb137aff7 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 19 Feb 2020 07:28:22 +0100 Subject: [PATCH 04/18] switch branches in _package.json_ --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 842aaa5..4806688 100644 --- a/package.json +++ b/package.json @@ -73,10 +73,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#typescript_3.8" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#develop" + "ordino": "github:Caleydo/ordino#typescript_3.8" }, "devDependencies": { "@types/jasmine": "2.5.47", From 54c0a7c7ad78061e3cd2e1b11814aa578d7ae28a Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 19 Feb 2020 07:28:30 +0100 Subject: [PATCH 05/18] update dependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4806688..85bc981 100644 --- a/package.json +++ b/package.json @@ -107,10 +107,10 @@ "style-loader": "0.16.1", "thread-loader": "1.1.2", "ts-loader": "4.0.1", - "tslib": "1.9.0", + "tslib": "~1.10.0", "tslint": "5.9.1", - "typedoc": "0.11.1", - "typescript": "2.8.1", + "typedoc": "~0.16.9", + "typescript": "~3.8.1-rc", "url-loader": "0.5.8", "webpack": "2.3.3", "webpack-dev-server": "2.4.2" From 72a36f264699009fe80fdb665057d40d883a8a03 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 27 Feb 2020 07:14:35 +0100 Subject: [PATCH 06/18] update requirements to latest versions --- requirements_dev.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 03169b4..f34272b 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,6 +1,6 @@ -flake8==3.5.0 -pep8-naming==0.8.2 -pytest==3.5.0 -pytest-runner==4.2 -Sphinx==1.7.2 +flake8==3.7.9 +pep8-naming==0.9.1 +pytest==5.3.5 +pytest-runner==5.2 +Sphinx==2.4.2 recommonmark==0.6.0 From 308ac1ef27e2a4f20742aea323f86ea72c0ead0b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 27 Feb 2020 07:14:44 +0100 Subject: [PATCH 07/18] switch branches in requirements file --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 185cf08..5752cdc 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@update_requirements#egg=tdp_core From 8873ee4f31f05b9903e773c11a227a71c94fceb6 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 27 Feb 2020 13:18:27 +0100 Subject: [PATCH 08/18] update typescript and tslib --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 85bc981..03a361a 100644 --- a/package.json +++ b/package.json @@ -107,10 +107,10 @@ "style-loader": "0.16.1", "thread-loader": "1.1.2", "ts-loader": "4.0.1", - "tslib": "~1.10.0", + "tslib": "~1.11.0", "tslint": "5.9.1", "typedoc": "~0.16.9", - "typescript": "~3.8.1-rc", + "typescript": "~3.8.2", "url-loader": "0.5.8", "webpack": "2.3.3", "webpack-dev-server": "2.4.2" From f8e6ee4d12f18cc23e787226860f4f4c5c5dad1f Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 15:41:12 +0100 Subject: [PATCH 09/18] switch branches in package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 03a361a..f63b9ce 100644 --- a/package.json +++ b/package.json @@ -73,10 +73,10 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#typescript_3.8" + "tdp_core": "github:datavisyn/tdp_core#update_dependencies_38" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#typescript_3.8" + "ordino": "github:Caleydo/ordino#update_dependencies_38" }, "devDependencies": { "@types/jasmine": "2.5.47", From 4c61dde397d1be42b7a4b57a39c1e838c7efe1e1 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 15:41:38 +0100 Subject: [PATCH 10/18] remove mkdirp dependency --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index f63b9ce..cef331c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "test:web": "test ! $(find tests -name \"*.ts\") || karma start", "test:python": "test ! $(find tests -name \"*.py\") || python setup.py test", "predist:web": "npm run build:web && npm run docs:web", - "dist:web": "mkdirp dist && cd build && tar cvzf ../dist/tdp_dummy.tar.gz *", + "dist:web": "mkdir dist && cd build && tar cvzf ../dist/tdp_dummy.tar.gz *", "dist:python": "python setup.py sdist bdist_wheel", "docs:web": "typedoc --options typedoc.json src/**.ts", "docs:python": "sphinx-apidoc -o docs -f ./tdp_dummy && sphinx-build ./docs build/docs", @@ -99,7 +99,6 @@ "karma-junit-reporter": "2.0.0", "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.3", - "mkdirp": "0.5.1", "node-sass": "^4.12.0", "null-loader": "0.1.1", "raw-loader": "0.5.1", From 357f48959ade52fbcd6183616cad74b13e4023ba Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 15:43:48 +0100 Subject: [PATCH 11/18] update webpack plugin older version uses typescript 2 as peerDependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cef331c..a389ea3 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "extract-loader": "0.1.0", "ifdef-loader": "2.0.0", "file-loader": "0.11.1", - "fork-ts-checker-webpack-plugin": "0.4.1", + "fork-ts-checker-webpack-plugin": "0.4.4", "html-loader": "0.4.5", "imports-loader": "0.7.1", "jasmine": "2.5.3", From 490f2983a16b71a426ca4954f72decec5abc15fa Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 15:44:11 +0100 Subject: [PATCH 12/18] update node-sass and typedoc --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a389ea3..c9d7315 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "karma-junit-reporter": "2.0.0", "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.3", - "node-sass": "^4.12.0", + "node-sass": "^4.13.1", "null-loader": "0.1.1", "raw-loader": "0.5.1", "sass-loader": "6.0.7", @@ -108,7 +108,7 @@ "ts-loader": "4.0.1", "tslib": "~1.11.0", "tslint": "5.9.1", - "typedoc": "~0.16.9", + "typedoc": "~0.16.10", "typescript": "~3.8.2", "url-loader": "0.5.8", "webpack": "2.3.3", From 2a88a235a636f9970289b370fdb53099a8ddaf6b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 4 Mar 2020 16:03:57 +0100 Subject: [PATCH 13/18] update webpack plugin older version uses typescript 2 as peerDependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03a361a..8c91e04 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "extract-loader": "0.1.0", "ifdef-loader": "2.0.0", "file-loader": "0.11.1", - "fork-ts-checker-webpack-plugin": "0.4.1", + "fork-ts-checker-webpack-plugin": "0.4.4", "html-loader": "0.4.5", "imports-loader": "0.7.1", "jasmine": "2.5.3", From 5b2ce3d2519ac5b90a8c4baa3d46ab12e0cc75eb Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Thu, 5 Mar 2020 14:11:51 +0100 Subject: [PATCH 14/18] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8c91e04..5aec1be 100644 --- a/package.json +++ b/package.json @@ -73,10 +73,10 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#typescript_3.8" + "tdp_core": "github:datavisyn/tdp_core#develop" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#typescript_3.8" + "ordino": "github:Caleydo/ordino#develop" }, "devDependencies": { "@types/jasmine": "2.5.47", From eb30efc82239f4200c17debfe0c182d502f2faf2 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Fri, 13 Mar 2020 01:15:52 +0100 Subject: [PATCH 15/18] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4b18a81..185cf08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e git+https://github.com/datavisyn/tdp_core.git@update_dep_req#egg=tdp_core +-e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core From 3ad2bce88a8fe27f9bcf7045693102c8deab1df4 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Fri, 13 Mar 2020 01:16:52 +0100 Subject: [PATCH 16/18] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 829f828..0b20a20 100644 --- a/package.json +++ b/package.json @@ -73,10 +73,10 @@ "predist:python": "npm run build:python && npm run docs:python" }, "dependencies": { - "tdp_core": "github:datavisyn/tdp_core#update_dep_req" + "tdp_core": "github:datavisyn/tdp_core#develop" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#update_dep_req" + "ordino": "github:Caleydo/ordino#develop" }, "devDependencies": { "@types/jasmine": "2.5.47", From 623c501071aee8228e567bfba46ae44ca450618e Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 13 Mar 2020 13:07:09 +0100 Subject: [PATCH 17/18] change `buildId` to `JSON.stringify(buildId)` --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 95542e3..7d76873 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -185,7 +185,7 @@ function generateWebpack(options) { 'process.env.NODE_ENV': JSON.stringify(options.isProduction ? 'production' : 'development'), __VERSION__: JSON.stringify(pkg.version), __LICENSE__: JSON.stringify(pkg.license), - __BUILD_ID__: buildId, + __BUILD_ID__: JSON.stringify(buildId), __DEBUG__: options.isDev || options.isTest, __TEST__: options.isTest, __PRODUCTION__: options.isProduction, From c106558c30ac8fbc387ad5c90e486a47f47e0479 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 18 Mar 2020 09:26:42 +0100 Subject: [PATCH 18/18] prepare release 7.0.0 --- package.json | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0b20a20..7fc9227 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tdp_dummy", "description": "", "homepage": "https://phovea.caleydo.org", - "version": "6.0.1-SNAPSHOT", + "version": "7.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -73,10 +73,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#semver:^9.0.0" }, "optionalDependencies": { - "ordino": "github:Caleydo/ordino#develop" + "ordino": "github:Caleydo/ordino#semver:^7.0.0" }, "devDependencies": { "@types/jasmine": "2.5.47", diff --git a/requirements.txt b/requirements.txt index 185cf08..789699f 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@v9.0.0#egg=tdp_core