Using generator-phovea v2.0.1

Closes #259 - update to papaparse minor version - update to D3 patch version - update dev dependencies - udpate webpack.config.js - update buildInfo.js
datavisyn · Dec 2, 2019 · fe6b255 · fe6b255
1 parent 18b047e
commit fe6b255
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 128 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,54 +3,83 @@ jobs:
   build:
     working_directory: ~/phovea
     docker:
-      - image: caleydo/phovea_circleci_python:v2.0
+      - image: caleydo/phovea_circleci_python:v3.0
     steps:
       - checkout
       - run:
+          name: Show Node.js and npm version
+          command: |
+            node -v
+            npm -v
+      - run:
+          name: Show Python and pip version
+          command: |
+            python --version
+            pip --version
+      - run:
+          name: Install Docker packages from docker_packages.txt
           command: |
             (!(test -f docker_packages.txt) || (cat docker_packages.txt | xargs sudo apt-get install -y))
       - restore_cache:
-          key: deps4-{{ checksum "package.json" }}
+          key: deps2-{{ .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: deps4-{{ checksum "package.json" }}
+          key: deps2-{{ .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: Show installed npm dependencies
+          command: npm list --depth=1 || true
       - restore_cache:
-          key: deps1-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
+          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
       - run:
-          name: install-pip-wee
+          name: Install pip requirements
           command: |
             virtualenv ~/venv
             . ~/venv/bin/activate
             pip install -r requirements_dev.txt
             pip install -r requirements.txt
       - save_cache:
-          key: deps1-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
+          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
           paths:
           - ~/venv
-      - run: #force update of VCS dependencies?
-          name: update-pip-vcs-dependencies
+      - run:
+          name: Force an update of pip dependencies from git repositories # not sure if this is working ?
           command: |
             . ~/venv/bin/activate
             pip install --upgrade --upgrade-strategy=only-if-needed -r requirements.txt
       - run:
-          name: build
+          name: Show installed pip packages
+          command: pip list || true
+      - run:
+          name: Build
           command: |
             . ~/venv/bin/activate
-            npm run build
-
+            npm run dist
+      - store_artifacts:
+          path: dist
+          prefix: 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:

diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ node_modules/
 /tests/**/*.js
 *.map
 *.css
+/.cache-loader
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: caleydo/phovea_circleci_python:v1.0
+image: caleydo/phovea_circleci_python:v3.0
 
 variables:
   GIT_DEPTH: "1"

diff --git a/.yo-rc.json b/.yo-rc.json
@@ -43,6 +43,12 @@
     ],
     "ignores": [],
     "today": "Sun, 06 Nov 2016 15:02:36 GMT",
-    "clientOnly": false
+    "clientOnly": false,
+    "promptValues": {
+      "authorName": "datavisyn",
+      "authorEmail": "[email protected]",
+      "authorUrl": "https://www.datavisyn.io",
+      "githubAccount": "datavisyn"
+    }
   }
-}
+}
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,17 @@
+* Release number or git hash: 
+* Web browser version and OS: 
+* Environment (local or deployed): 
+
+### Steps to reproduce
+
+1. 
+2. 
+
+### Observed behavior
+* Any unexpected output or action (or lack of expected output or action)
+* Web browser console errors (including tracebacks)
+* Server errors (relevant messages and tracebacks)
+* Static or animated images showing the UI behavior
+
+### Expected behavior
+* 
diff --git a/buildInfo.js b/buildInfo.js
@@ -139,7 +139,7 @@ function resolveScreenshot() {
   if (!fs.existsSync(f)) {
     return null;
   }
-  const buffer = new Buffer(fs.readFileSync(f)).toString('base64');
+  const buffer = Buffer.from(fs.readFileSync(f)).toString('base64');
   return `data:image/png;base64,${buffer}`;
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
     "redhat_packages.txt"
   ],
   "engines": {
-    "npm": ">= 3",
-    "node": ">= 6",
+    "npm": ">= 6.12",
+    "node": ">= 12.13",
     "iojs": ">= 3"
   },
   "scripts": {
@@ -43,7 +43,7 @@
     "predist": "echo hybrid",
     "dist": "npm run dist:web && npm run dist:python",
     "compile": "tsc",
-    "lint": "tslint -c tslint.json -p .",
+    "lint": "tslint -c tslint.json -p . 'src/**/*.ts?(x)' 'tests/**/*.ts?(x)'",
     "docs": "npm run docs:web && npm run docs:python",
     "prebuild": "echo hybrid",
     "posttest": "echo hybrid",
@@ -63,7 +63,7 @@
     "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_core.tar.gz *",
-    "dist:python": "python setup.py sdist bdist_wheel",
+    "dist:python": "python setup.py bdist_egg",
     "predocker": "npm run build",
     "docker": "docker build -t tdp_core -f deploy/Dockerfile .",
     "docs:web": "typedoc --options typedoc.json src/**.ts",
@@ -75,24 +75,27 @@
     "prebuild:web": "node -e \"process.exit(process.env.PHOVEA_SKIP_TESTS === undefined?1:0)\" || npm run test:web"
   },
   "dependencies": {
-    "@types/d3": "3.5.36",
-    "@types/select2": "4.0.41",
-    "d3": "3.5.17",
+    "@types/d3": "~3.5.36",
+    "@types/select2": "~4.0.47",
+    "d3": "~3.5.17",
     "lineupjs": "github:lineupjs/lineupjs#develop",
     "phovea_clue": "^2.2.0",
-    "select2": "4.0.4",
+    "select2": "~4.0.5",
     "select2-bootstrap-theme": "0.1.0-beta.9",
-    "@types/jquery": "2.0.33",
-    "jquery": "3.1.1"
+    "@types/jquery": "~3.3.6",
+    "jquery": "~3.3.1"
   },
   "main": "build/tdp_core.js",
   "devDependencies": {
     "@types/jasmine": "2.5.47",
     "awesome-typescript-loader": "3.1.2",
+    "cache-loader": "1.2.0",
     "css-loader": "0.28.0",
-    "extract-loader": "0.1.0",
     "extract-text-webpack-plugin": "2.1.0",
+    "extract-loader": "0.1.0",
+    "ifdef-loader": "2.0.0",
     "file-loader": "0.11.1",
+    "fork-ts-checker-webpack-plugin": "0.4.1",
     "html-loader": "0.4.5",
     "imports-loader": "0.7.1",
     "jasmine": "2.5.3",
@@ -110,17 +113,14 @@
     "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",
     "tslint": "5.9.1",
     "typedoc": "0.11.1",
-    "typescript": "2.7.2",
+    "typescript": "2.8.1",
     "url-loader": "0.5.8",
     "webpack": "2.3.3",
-    "webpack-dev-server": "2.4.2",
-    "cache-loader": "1.2.0",
-    "ifdef-loader": "2.0.0",
-    "fork-ts-checker-webpack-plugin": "0.4.1",
-    "thread-loader": "1.1.2",
-    "ts-loader": "4.0.1"
+    "webpack-dev-server": "2.4.2"
   }
 }
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server
-pymongo==3.0.3
+pymongo~=3.7.1
 requests~=2.20.0
 SQLAlchemy==1.1.11
 urllib3==1.20
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,3 +22,4 @@ node_modules/ @@
     /tests/**/*.js
     *.map
     *.css
+    /.cache-loader