Merge pull request #25 from Caleydo/release-4.0.0

Prepare Archiving

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/phovea
     docker:
-      - image: circleci/python:3.7-buster-node-browsers # for node version see Dockerfile on https://hub.docker.com/r/circleci/python
+      - image: circleci/python:3.7.11-buster-node-browsers # for node version see Dockerfile on https://hub.docker.com/r/circleci/python
     steps:
       - checkout
       - setup_remote_docker
@@ -103,16 +103,16 @@ jobs:
             fi
 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-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:

README.md

@@ -1,7 +1,10 @@
-gapminder_product
+DEPRECATED: gapminder_product
 =====================
  [![Phovea][phovea-image]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][circleci-image]][circleci-url]
 
+### DEPRECATION Information
+Please note that this project has been archived and is no longer being maintained. There is an active development under https://github.com/datavisyn/tdp_core and we will also contribute our future changes to it.
+
 
 Installation
 ------------

package.json

@@ -25,7 +25,7 @@
     "bluebird": "3.7.2",
     "chalk": "3.0.0",
     "fs-extra": "^9.0.1",
-    "generator-phovea": "github:phovea/generator-phovea#develop",
+    "generator-phovea": "^8.0.0",
     "lodash": "4.17.15",
     "yamljs": "0.3.0",
     "yargs-parser": "18.0.0",

phovea_product.json

@@ -3,41 +3,41 @@
     "type": "web",
     "label": "gapminder",
     "repo": "Caleydo/gapminder",
-    "branch": "v5.0.0",
+    "branch": "v6.0.0",
     "additional": []
   },
   {
     "type": "api",
     "label": "gapminder_server",
     "repo": "phovea/phovea_server",
-    "branch": "v7.0.0",
+    "branch": "v7.2.0",
     "additional": [
       {
         "name": "phovea_security_flask",
         "repo": "phovea/phovea_security_flask",
-        "branch": "v7.0.0"
+        "branch": "v9.0.0"
       },
       {
         "name": "phovea_data_redis",
         "repo": "phovea/phovea_data_redis",
-        "branch": "v7.0.0"
+        "branch": "v8.0.0"
       },
       {
         "name": "phovea_data_mongo",
         "repo": "phovea/phovea_data_mongo",
-        "branch": "v7.0.0"
+        "branch": "v8.0.0"
       },
       {
         "name": "phovea_clue",
         "repo": "phovea/phovea_clue",
-        "branch": "v7.0.0"
+        "branch": "v9.0.0"
       }
     ],
     "data": [
       {
         "type": "repo",
         "repo": "Caleydo/gapminder",
-        "branch": "v5.0.0"
+        "branch": "v6.0.0"
       }
     ]
   }

templates/web/workspace.scss

@@ -1,3 +1,16 @@
+// Import custom theme variables and bootstrap variables overrides
+@import "~phovea_ui/dist/scss/themes/phovea";
+// @import "~tdp_core/dist/scss/themes/datavisyn";
+
+// Include remainder of required Bootstrap stylesheets
+@import "~phovea_ui/dist/scss/vendors/bootstrap/1_variables_mixins_utilities";
+
+// map-merge my theme-colors
+// @import "~gapminder/dist/scss/vendors/bootstrap_modify_maps";
+
+// Include all Bootstrap components as needed
+@import "~phovea_ui/dist/scss/vendors/bootstrap/2_components";
+
 @debug('import plugin scss variables');
 @import "~gapminder/dist/scss/abstracts/variables";
 @import "~phovea_vis/dist/scss/abstracts/variables";