From 36100f0bd7a04114b3dfaffadcb9351c0e5f9934 Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Fri, 12 Feb 2021 19:04:56 +0100 Subject: [PATCH 1/3] changes for 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 5478e35..b88dd32 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tdp_dummy", "description": "", "homepage": "https://phovea.caleydo.org", - "version": "9.0.0", + "version": "9.0.1-SNAPSHOT", "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": "^11.0.0" + "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#semver:^9.0.0" + "ordino": "github:Caleydo/ordino#develop" } } diff --git a/requirements.txt b/requirements.txt index 5cf2b6c..2888ae5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -tdp_core>=11.0.0,<12.0.0 \ No newline at end of file +-e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core \ No newline at end of file From 0658d80cf897585cbda1d616a112014e47e269ec Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Fri, 19 Feb 2021 15:28:17 +0100 Subject: [PATCH 2/3] Remove SCSS import in TS files --- dist/base/DummySearchProvider.d.ts | 1 - dist/base/DummySearchProvider.js | 1 - dist/base/DummySearchProvider.js.map | 2 +- dist/views/DummyDetailView.d.ts | 1 - dist/views/DummyDetailView.js | 1 - dist/views/DummyDetailView.js.map | 2 +- src/base/DummySearchProvider.ts | 1 - src/views/DummyDetailView.ts | 2 -- 8 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dist/base/DummySearchProvider.d.ts b/dist/base/DummySearchProvider.d.ts index f2a041f..7da09af 100644 --- a/dist/base/DummySearchProvider.d.ts +++ b/dist/base/DummySearchProvider.d.ts @@ -1,5 +1,4 @@ import { IDummyDataSource } from './config'; -import '../scss/main.scss'; import { IResult, ISearchProvider } from 'tdp_core'; export declare class DummySearchProvider implements ISearchProvider { private readonly dataSource; diff --git a/dist/base/DummySearchProvider.js b/dist/base/DummySearchProvider.js index 84a326f..e37013e 100644 --- a/dist/base/DummySearchProvider.js +++ b/dist/base/DummySearchProvider.js @@ -1,6 +1,5 @@ import { dataSourceA, dataSourceB } from './config'; import { RestBaseUtils } from 'tdp_core'; -import '../scss/main.scss'; export class DummySearchProvider { constructor(dataSource) { this.dataSource = dataSource; diff --git a/dist/base/DummySearchProvider.js.map b/dist/base/DummySearchProvider.js.map index d600e3c..aab36aa 100644 --- a/dist/base/DummySearchProvider.js.map +++ b/dist/base/DummySearchProvider.js.map @@ -1 +1 @@ -{"version":3,"file":"DummySearchProvider.js","sourceRoot":"","sources":["../../src/base/DummySearchProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,WAAW,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AACpE,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,mBAAmB,CAAC;AAG3B,MAAM,OAAO,mBAAmB;IAE9B,YAA6B,UAA4B;QAA5B,eAAU,GAAV,UAAU,CAAkB;IAEzD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,IAAY,EAAE,QAAgB;QAClD,OAAO,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,QAAQ,EAAE;YAC3E,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,OAAO;YACvC,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,KAAe;QACtB,OAA2B,aAAa,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,eAAe,EAAE,EAAE,EAAE;YAChH,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,EAAE,KAAK;SACzC,CAAC,CAAC;IACL,CAAC;CACF;AAGD,MAAM,UAAU,OAAO;IACrB,OAAO,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,OAAO;IACrB,OAAO,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC"} \ No newline at end of file +{"version":3,"file":"DummySearchProvider.js","sourceRoot":"","sources":["../../src/base/DummySearchProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,WAAW,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AACpE,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AAGvC,MAAM,OAAO,mBAAmB;IAE9B,YAA6B,UAA4B;QAA5B,eAAU,GAAV,UAAU,CAAkB;IAEzD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,IAAY,EAAE,QAAgB;QAClD,OAAO,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,QAAQ,EAAE;YAC3E,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,OAAO;YACvC,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,KAAe;QACtB,OAA2B,aAAa,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,eAAe,EAAE,EAAE,EAAE;YAChH,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,EAAE,KAAK;SACzC,CAAC,CAAC;IACL,CAAC;CACF;AAGD,MAAM,UAAU,OAAO;IACrB,OAAO,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,OAAO;IACrB,OAAO,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC"} \ No newline at end of file diff --git a/dist/views/DummyDetailView.d.ts b/dist/views/DummyDetailView.d.ts index fba44c5..f0bc6a2 100644 --- a/dist/views/DummyDetailView.d.ts +++ b/dist/views/DummyDetailView.d.ts @@ -1,7 +1,6 @@ /** * Created by Samuel Gratzl on 27.04.2016. */ -import '../scss/main.scss'; import { AD3View } from 'tdp_core'; export declare class DummyDetailView extends AD3View { private readonly x; diff --git a/dist/views/DummyDetailView.js b/dist/views/DummyDetailView.js index 66ce324..ff0cc5e 100644 --- a/dist/views/DummyDetailView.js +++ b/dist/views/DummyDetailView.js @@ -1,7 +1,6 @@ /** * Created by Samuel Gratzl on 27.04.2016. */ -import '../scss/main.scss'; import { AD3View } from 'tdp_core'; import { ErrorAlertHandler } from 'tdp_core'; import * as d3 from 'd3'; diff --git a/dist/views/DummyDetailView.js.map b/dist/views/DummyDetailView.js.map index c2ea313..0d1c3a8 100644 --- a/dist/views/DummyDetailView.js.map +++ b/dist/views/DummyDetailView.js.map @@ -1 +1 @@ -{"version":3,"file":"DummyDetailView.js","sourceRoot":"","sources":["../../src/views/DummyDetailView.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DummyDetailView.js","sourceRoot":"","sources":["../../src/views/DummyDetailView.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/base/DummySearchProvider.ts b/src/base/DummySearchProvider.ts index d217451..3262ceb 100644 --- a/src/base/DummySearchProvider.ts +++ b/src/base/DummySearchProvider.ts @@ -1,6 +1,5 @@ import {IDummyDataSource, dataSourceA, dataSourceB} from './config'; import {RestBaseUtils} from 'tdp_core'; -import '../scss/main.scss'; import {IResult, ISearchProvider} from 'tdp_core'; export class DummySearchProvider implements ISearchProvider { diff --git a/src/views/DummyDetailView.ts b/src/views/DummyDetailView.ts index 914a47b..6e6da50 100644 --- a/src/views/DummyDetailView.ts +++ b/src/views/DummyDetailView.ts @@ -1,7 +1,6 @@ /** * Created by Samuel Gratzl on 27.04.2016. */ -import '../scss/main.scss'; import {AD3View} from 'tdp_core'; import {ErrorAlertHandler} from 'tdp_core'; import * as d3 from 'd3'; @@ -98,4 +97,3 @@ export class DummyDetailView extends AD3View { return promise; } } - From 925275b02fe7b68f8b1ee7c7a45efd23793c97c0 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 19 Feb 2021 16:19:19 +0100 Subject: [PATCH 3/3] prepare release 9.0.1 --- package.json | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index b88dd32..34a9018 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tdp_dummy", "description": "", "homepage": "https://phovea.caleydo.org", - "version": "9.0.1-SNAPSHOT", + "version": "9.0.1", "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": "^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:^9.0.0" } } diff --git a/requirements.txt b/requirements.txt index 2888ae5..5cf2b6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e git+https://github.com/datavisyn/tdp_core.git@develop#egg=tdp_core \ No newline at end of file +tdp_core>=11.0.0,<12.0.0 \ No newline at end of file