Merge pull request #6 from Caleydo/update_master

Caleydo · Nov 29, 2021 · 0dc4242 · 0dc4242
2 parents 08a1e6f + b1ad181
commit 0dc4242
Show file tree

Hide file tree

Showing 43 changed files with 63 additions and 65 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,7 +30,7 @@ jobs:
           command: |
             (!(test -f docker_packages.txt) || (cat docker_packages.txt | xargs sudo apt-get install -y))
       - restore_cache:
-          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
+          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
       - run:
           name: Install pip requirements
           command: |
@@ -39,7 +39,7 @@ jobs:
             pip install -r requirements_dev.txt
             pip install -r requirements.txt
       - save_cache:
-          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
+          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
           paths:
           - ~/venv
       - run:
@@ -99,7 +99,7 @@ jobs:
             node -v
             npm -v
       - restore_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
+          key: deps2-{{ .Branch }}-{{ checksum "package.json" }}
       - run:
           name: Install npm dependencies
           command: npm install
@@ -108,7 +108,7 @@ jobs:
           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" }}
+          key: deps2-{{ .Branch }}-{{ checksum "package.json" }}
           paths: ./node_modules
       - run:
           name: Install npm dependencies from git repositories (always get latest commit)

diff --git a/.yo-rc.json b/.yo-rc.json
@@ -2,8 +2,7 @@
   "generator-phovea": {
     "type": "app-slib",
     "modules": [
-      "phovea_core",
-      "phovea_ui",
+      "tdp_core",
       "phovea_server"
     ],
     "vendors": {

diff --git a/dist/Cohort.d.ts b/dist/Cohort.d.ts
diff --git a/dist/Cohort.js b/dist/Cohort.js
diff --git a/dist/Cohort.js.map b/dist/Cohort.js.map
diff --git a/dist/CohortInterfaces.d.ts b/dist/CohortInterfaces.d.ts
diff --git a/dist/Overview/CohortOverview.d.ts b/dist/Overview/CohortOverview.d.ts
diff --git a/dist/Overview/CohortOverview.js b/dist/Overview/CohortOverview.js
diff --git a/dist/Overview/CohortOverview.js.map b/dist/Overview/CohortOverview.js.map
diff --git a/dist/Provenance/CohortEV.d.ts b/dist/Provenance/CohortEV.d.ts
diff --git a/dist/Provenance/CohortEV.js b/dist/Provenance/CohortEV.js
diff --git a/dist/Provenance/CohortEV.js.map b/dist/Provenance/CohortEV.js.map
diff --git a/dist/Provenance/General.d.ts b/dist/Provenance/General.d.ts
diff --git a/dist/Provenance/General.js b/dist/Provenance/General.js
diff --git a/dist/Provenance/General.js.map b/dist/Provenance/General.js.map
diff --git a/dist/app.d.ts b/dist/app.d.ts
diff --git a/dist/app.js b/dist/app.js
diff --git a/dist/app.js.map b/dist/app.js.map
diff --git a/dist/cohortview.d.ts b/dist/cohortview.d.ts
diff --git a/dist/menu/DatasetCard.js b/dist/menu/DatasetCard.js