Skip to content

Commit

Permalink
Merge pull request #62 from Caleydo/release-2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkh authored Aug 13, 2020
2 parents 53098b0 + 21c600b commit adf0d10
Show file tree
Hide file tree
Showing 152 changed files with 9,759 additions and 1,309 deletions.
54 changes: 43 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,61 @@ jobs:
build:
working_directory: ~/phovea
docker:
- image: circleci/node:6-browsers
tags:
- /v\d+.\d+.\d+.*/
- image: circleci/node:12.13-buster-browsers
steps:
- checkout
- run:
name: Show Node.js and npm version
command: |
node -v
npm -v
- restore_cache:
key: deps2-{{ .Branch }}-{{ checksum "package.json" }}
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
- run:
name: install-npm-wee
name: Install npm dependencies
command: npm install
- run: #remove all resolved github dependencies
name: delete-vcs-dependencies
- 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" }}
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
paths:
- ./node_modules
- run: #install all dependencies
name: install-npm-wee2
- run:
name: Install npm dependencies from git repositories (always get latest commit)
command: npm install
- run:
name: dist
name: Show installed npm dependencies
command: npm list --depth=1 || true
- run:
name: Build
command: npm run dist
- store_artifacts:
path: dist
workflows:
version: 2
# build-nightly:
# triggers:
# - schedule:
# cron: "15 1 * * 1-5" # "At 01:15 on every day-of-week from Monday through Friday.”, see: https://crontab.guru/#15_1_*_*_1-5
# filters:
# branches:
# only:
# - develop
# jobs:
# - build
build-branch:
jobs:
- build:
filters:
tags:
ignore: /^v.*/
build-tag:
jobs:
- build:
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
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
10 changes: 4 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/.tscache
/.idea
/build/
/dist/
/lib/
node_modules/
/src/**/*.js
/src/**/*.d.ts
/tests/**/*.js
/tests/**/*.d.ts
*.map
/src/**/*.map
/tests/**/*.map
*.css
*.log
/.cache-loader
package-lock.json
46 changes: 0 additions & 46 deletions .gitlab-ci.yml

This file was deleted.

14 changes: 10 additions & 4 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@
"entries": "./index.js",
"ignores": [],
"extensions": [],
"name": "touring",
"author": "Klaus Eckelt",
"name": "tourdino",
"author": "The Caleydo Team",
"today": "Wed, 19 Sep 2018 10:27:30 GMT",
"githubAccount": "caleydo"
"githubAccount": "caleydo",
"promptValues": {
"authorName": "The Caleydo Team",
"authorEmail": "[email protected]",
"authorUrl": "https://caleydo.org/",
"githubAccount": "caleydo"
}
}
}
}
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@


# TourDino

[![Phovea][phovea-image]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][circleci-image]][circleci-url]


A TypeScript library to calculate and visualize similarity measures.

## Similarity Measures
Expand Down Expand Up @@ -33,7 +39,6 @@ This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform
[phovea-url]: https://phovea.caleydo.org
[npm-image]: https://badge.fury.io/js/touring.svg
[npm-url]: https://npmjs.org/package/touring
[travis-image]: https://travis-ci.org/caleydo/touring.svg?branch=master
[travis-url]: https://travis-ci.org/caleydo/touring
[daviddm-image]: https://david-dm.org/caleydo/touring/status.svg
[daviddm-url]: https://david-dm.org/caleydo/touring
[circleci-image]: https://circleci.com/gh/Caleydo/tourdino.svg?style=shield
[circleci-url]: https://circleci.com/gh/Caleydo/tourdino

176 changes: 0 additions & 176 deletions buildInfo.js

This file was deleted.

32 changes: 32 additions & 0 deletions dist/app/TouringPanel.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import '../scss/main.scss';
import 'd3.parsets/d3.parsets';
import 'd3-grubert-boxplot/box';
import { LocalDataProvider } from 'lineupjs';
import { PanelTab } from 'tdp_core/dist/lineup/internal/panel/PanelTab';
import { IPanelTabExtensionDesc } from 'tdp_core/dist/lineup/internal/LineUpPanelActions';
import { RowComparison } from '../tasks/RowComparisonTask';
import { ColumnComparison } from '../tasks/ColumnComparisonTask';
export declare const tasks: (ColumnComparison | RowComparison)[];
export declare class TouringPanel {
private readonly _desc;
private readonly tab;
private readonly provider;
private readonly node;
private ranking;
private currentTask;
private active;
constructor(_desc: IPanelTabExtensionDesc, tab: PanelTab, provider: LocalDataProvider);
private init;
private initTasks;
private insertTasks;
private addEventListeners;
updateOutput(forceUpdate?: boolean): Promise<void>;
private updateTask;
/**
*
* @param tab PanelTab
* @param provider Instance of the LocalDataProvider that contains all ranking
* @param desc Options provided through the extension point i.e `headerCssClass, headerTitle`
*/
static create(desc: IPanelTabExtensionDesc, tab: PanelTab, provider: LocalDataProvider): void;
}
Loading

0 comments on commit adf0d10

Please sign in to comment.