update plugins; change circleci

phovea · Feb 15, 2021 · 4806f91 · 4806f91
1 parent 1ada37e
commit 4806f91
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 61 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,9 +1,14 @@
-version: 2
-jobs:
-  build:
+version: 2.1
+
+executors:
+  node-executor:
     working_directory: ~/phovea
     docker:
-      - image: circleci/node:12-browsers
+      - image: circleci/node:12.13-buster-browsers
+
+jobs:
+  build:
+    executor: node-executor
     steps:
       - checkout
       - run:
@@ -12,22 +17,37 @@ jobs:
             node -v
             npm -v
       - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "package.json" }}
+          key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
       - run:
           name: Install npm dependencies
           command: npm install
       - save_cache:
-          key: deps-{{ .Branch }}-{{ checksum "package.json" }}
-          paths:
-          - ./node_modules
+          key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
+          paths: ./node_modules
+
       - run:
           name: Show installed npm dependencies
           command: npm list --depth=1 || true
       - run:
           name: Run test
           command: npm run test
+      - persist_to_workspace:
+          root: ~/phovea
+          paths: .
+  publish:
+    executor: node-executor
+    steps:
+      - attach_workspace:
+          at: ~/phovea
+      - run:
+          name: Authentication
+          command: |
+            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+      - run:
+          name: Publish package
+          command: npm publish
 workflows:
-  version: 2
+  version: 2.1
 #  build-nightly:
 #    triggers:
 #      - schedule:
@@ -38,17 +58,27 @@ workflows:
 #                - develop
 #    jobs:
 #      - build
-  build-branch:
+  build-branches-only:
     jobs:
       - build:
           filters:
             tags:
-              ignore: /^v.*/
-  build-tag:
+              ignore: /.*/
+  build-publish-tag:
     jobs:
       - build:
           filters:
             branches:
               ignore: /.*/
             tags:
               only: /^v.*/
+      - publish:
+          context:
+            - org-public
+          requires:
+            - build
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v.*/
diff --git a/knownPhoveaPlugins.json b/knownPhoveaPlugins.json
@@ -6,7 +6,7 @@
       "description": "Phovea Core Plugin",
       "repository": "https://github.com/phovea/phovea_core.git",
       "dependencies": {
-        "phovea_core": "^4.0.0"
+        "phovea_core": "^6.0.0"
       },
       "develop": {
         "dependencies": {
@@ -21,7 +21,7 @@
       "description": "Phovea D3 Plugin",
       "repository": "https://github.com/phovea/phovea_d3.git",
       "dependencies": {
-        "phovea_d3": "^4.0.0"
+        "phovea_d3": "^6.0.0"
       },
       "develop": {
         "dependencies": {
@@ -38,7 +38,7 @@
       "description": "Phovea Vis Plugin",
       "repository": "https://github.com/phovea/phovea_vis.git",
       "dependencies": {
-        "phovea_vis": "^4.0.0"
+        "phovea_vis": "^6.0.0"
       },
       "develop": {
         "dependencies": {
@@ -55,7 +55,7 @@
       "description": "Phovea Common Style Plugin",
       "repository": "https://github.com/phovea/phovea_ui.git",
       "dependencies": {
-        "phovea_ui": "^4.0.0"
+        "phovea_ui": "^6.0.0"
       },
       "develop": {
         "dependencies": {
@@ -73,7 +73,7 @@
       "description": "Phovea Importer Plugin",
       "repository": "https://github.com/phovea/phovea_importer.git",
       "dependencies": {
-        "phovea_importer": "^5.0.0"
+        "phovea_importer": "^7.0.0"
       },
       "develop": {
         "dependencies": {
@@ -91,7 +91,7 @@
       "description": "Phovea Security",
       "repository": "https://github.com/phovea/phovea_security_flask.git",
       "dependencies": {
-        "phovea_security_flask": "^5.0.0"
+        "phovea_security_flask": "^7.0.0"
       },
       "develop": {
         "dependencies": {
@@ -103,7 +103,7 @@
       },
       "libraries": [],
       "requirements": {
-        "phovea_security_flask": ">=5.0.0,<6.0.0"
+        "phovea_security_flask": ">=7.0.0,<8.0.0"
       }
     },
     {
@@ -112,7 +112,7 @@
       "description": "Phovea Server Plugin",
       "repository": "https://github.com/phovea/phovea_server.git",
       "requirements": {
-        "phovea_server": ">=5.0.1,<6.0.0"
+        "phovea_server": ">=7.0.0,<8.0.0"
       },
       "develop": {
         "requirements": {
@@ -126,7 +126,7 @@
       "description": "Phovea Server RedisDB Plugin",
       "repository": "https://github.com/phovea/phovea_data_redis.git",
       "requirements": {
-        "phovea_data_redis": ">=5.0.0,<6.0.0"
+        "phovea_data_redis": ">=7.0.0,<8.0.0"
       },
       "develop": {
         "requirements": {
@@ -140,7 +140,7 @@
       "description": "Phovea Server MongoDB Plugin",
       "repository": "https://github.com/phovea/phovea_data_mongo.git",
       "requirements": {
-        "phovea_data_mongo": ">=5.0.0,<6.0.0"
+        "phovea_data_mongo": ">=7.0.0,<8.0.0"
       },
       "develop": {
         "requirements": {
@@ -154,7 +154,7 @@
       "description": "Phovea Server HDF5 Plugin",
       "repository": "https://github.com/phovea/phovea_data_hdf.git",
       "requirements": {
-        "phovea_data_hdf": ">=5.0.0,<6.0.0"
+        "phovea_data_hdf": ">=7.0.0,<8.0.0"
       },
       "develop": {
         "requirements": {
@@ -168,10 +168,10 @@
       "description": "Phovea CLUE Plugin",
       "repository": "https://github.com/phovea/phovea_clue.git",
       "dependencies": {
-        "phovea_clue": "^5.0.0"
+        "phovea_clue": "^7.0.0"
       },
       "requirements": {
-        "phovea_clue": ">=5.0.0,<6.0.0"
+        "phovea_clue": ">=7.0.0,<8.0.0"
       },
       "develop": {
         "dependencies": {
@@ -191,10 +191,10 @@
       "description": "Phovea Processing Queue Plugin",
       "repository": "https://github.com/phovea/phovea_processing_queue.git",
       "dependencies": {
-        "phovea_processing_queue": "^4.0.0"
+        "phovea_processing_queue": "^6.0.0"
       },
       "requirements": {
-        "phovea_processing_queue": ">=4.0.0,<5.0.0"
+        "phovea_processing_queue": ">=6.0.0,<7.0.0"
       },
       "develop": {
         "dependencies": {
@@ -213,10 +213,10 @@
       "description": "Targid Discovery Platform",
       "repository": "https://github.com/datavisyn/tdp_core.git",
       "dependencies": {
-        "tdp_core": "github:datavisyn/tdp_core#semver:^9.1.0"
+        "tdp_core": "github:datavisyn/tdp_core#semver:^11.0.0"
       },
       "requirements": {
-        "-e git+https://github.com/datavisyn/tdp_core.git": "@v9.1.0#egg=tdp_core"
+        "-e git+https://github.com/datavisyn/tdp_core.git": "@v11.0.0#egg=tdp_core"
       },
       "develop": {
         "dependencies": {
@@ -251,18 +251,18 @@
         "d3": "d3/d3"
       },
       "dependencies": {
-        "@types/d3": "~5.0.0",
-        "d3": "~5.7.0"
+        "@types/d3": "~5.7.2",
+        "d3": "~5.16.0"
       }
     },
     {
       "name": "jquery",
       "type": "web",
-      "description": "JQuery 3.1",
+      "description": "JQuery 3.5",
       "aliases": {},
       "dependencies": {
-        "@types/jquery": "~3.3.6",
-        "jquery": "~3.3.1"
+        "@types/jquery": "~3.5.5",
+        "jquery": "~3.5.1"
       }
     },
     {
@@ -271,18 +271,8 @@
       "description": "PapaParse",
       "aliases": {},
       "dependencies": {
-        "@types/papaparse": "~4.5.3",
-        "papaparse": "~4.6.0"
-      }
-    },
-    {
-      "name": "jqueryui",
-      "type": "web",
-      "description": "JQuery UI",
-      "aliases": {},
-      "dependencies": {
-        "@types/jqueryui": "1.11.31",
-        "jqueryui": "1.11.1"
+        "@types/papaparse": "~5.2.5",
+        "papaparse": "~5.3.0"
       }
     },
     {
@@ -291,7 +281,7 @@
       "description": "LineUp.js",
       "aliases": {},
       "dependencies": {
-        "lineupjs": "^3.3.0"
+        "lineupjs": "^4.1.2"
       }
     },
     {
@@ -300,7 +290,7 @@
       "description": "Font Awesome",
       "aliases": {},
       "dependencies": {
-        "font-awesome": "~4.7.0"
+        "@fortawesome/fontawesome-free": "^5.15.1"
       }
     },
     {
@@ -312,8 +302,8 @@
         "bootstrap-sass"
       ],
       "dependencies": {
-        "@types/bootstrap": "3.3.32",
-        "bootstrap-sass": "3.3.7"
+        "@types/bootstrap": "4.5.0",
+        "bootstrap-sass": "3.4.1"
       }
     },
     {
@@ -324,7 +314,7 @@
       "externals": [],
       "dependencies": {
         "@types/select2": "~4.0.47",
-        "select2": "~4.0.5"
+        "select2": "~4.0.53"
       }
     },
     {
@@ -334,7 +324,7 @@
       "aliases": {},
       "externals": [],
       "dependencies": {
-        "moment": "~2.22.2"
+        "moment": "~2.29.1"
       }
     },
     {
@@ -346,7 +336,7 @@
       },
       "externals": [],
       "dependencies": {
-        "@types/jquery.scrollto": "~1.4.27",
+        "@types/jquery.scrollto": "~1.4.28",
         "jquery.scrollto": "~2.1.2"
       }
     },
@@ -357,8 +347,8 @@
       "aliases": {},
       "externals": [],
       "dependencies": {
-        "@types/lodash": "~4.14.116",
-        "lodash": "~4.17.10"
+        "@types/lodash": "~4.14.168",
+        "lodash": "~4.17.20"
       }
     },
     {
@@ -370,8 +360,8 @@
         "marked"
       ],
       "dependencies": {
-        "@types/marked": "~0.4.1",
-        "marked": "~0.5.0"
+        "@types/marked": "~1.2.2",
+        "marked": "~2.0.0"
       }
     },
     {
@@ -383,8 +373,8 @@
         "file-saver"
       ],
       "dependencies": {
-        "@types/file-saver": "~1.3.0",
-        "file-saver": "1.3.8"
+        "@types/file-saver": "~2.0.1",
+        "file-saver": "2.0.5"
       }
     },
     {
@@ -396,7 +386,7 @@
         "datavisyn-scatterplot"
       ],
       "dependencies": {
-        "datavisyn-scatterplot": "^1.1.1"
+        "datavisyn-scatterplot": "^4.0.0"
       }
     },
     {
@@ -412,7 +402,7 @@
       "type": "python",
       "description": "Mongo DB",
       "requirements": {
-        "pymongo": "~=3.7.1"
+        "pymongo": "~=3.11.1"
       }
     }
   ]