Skip to content
This repository has been archived by the owner on Mar 17, 2022. It is now read-only.

Commit

Permalink
Merge pull request #35 from Caleydo/release-7.0.0
Browse files Browse the repository at this point in the history
Release 7.0.0
  • Loading branch information
Christian Lehner authored Mar 18, 2020
2 parents 54d330e + c106558 commit 85fde5d
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @thinkh
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "tdp_dummy",
"description": "",
"homepage": "https://phovea.caleydo.org",
"version": "6.0.0",
"version": "7.0.0",
"author": {
"name": "The Caleydo Team",
"email": "contact@caleydo.org",
Expand Down Expand Up @@ -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",
Expand All @@ -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#semver:^9.0.0"
},
"optionalDependencies": {
"ordino": "github:Caleydo/ordino#semver:^6.0.0"
"ordino": "github:Caleydo/ordino#semver:^7.0.0"
},
"devDependencies": {
"@types/jasmine": "2.5.47",
Expand All @@ -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",
Expand All @@ -99,18 +99,17 @@
"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",
"node-sass": "^4.13.1",
"null-loader": "0.1.1",
"raw-loader": "0.5.1",
"sass-loader": "6.0.7",
"style-loader": "0.16.1",
"thread-loader": "1.1.2",
"ts-loader": "4.0.1",
"tslib": "1.9.0",
"tslib": "~1.11.0",
"tslint": "5.9.1",
"typedoc": "0.11.1",
"typescript": "2.8.1",
"typedoc": "~0.16.10",
"typescript": "~3.8.2",
"url-loader": "0.5.8",
"webpack": "2.3.3",
"webpack-dev-server": "2.4.2"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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@v9.0.0#egg=tdp_core
10 changes: 5 additions & 5 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"moduleResolution": "node",
"jsx": "react",
"experimentalDecorators": true,
"downlevelIteration": true, // required as long as target is `es5`
"lib": [
"dom",
"es2015",
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 85fde5d

Please sign in to comment.