Release 3.0.0 (#27)

Release 3.0.0

.circleci/config.yml

@@ -3,18 +3,27 @@ jobs:
   build:
     working_directory: ~/phovea
     docker:
-      - image: caleydo/phovea_circleci_python:v1.0
-    tags:
-      - /v\d+.\d+.\d+.*/
+      - 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: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_dev.txt" }}
       - run:
-          name: install-pip-wee
+          name: Install pip requirements
           command: |
             virtualenv ~/venv
             . ~/venv/bin/activate
@@ -24,16 +33,44 @@ jobs:
           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: dist
+          name: Show installed pip packages
+          command: pip list || true
+      - run:
+          name: Build
           command: |
             . ~/venv/bin/activate
             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:
+          filters:
+            tags:
+              ignore: /^v.*/
+  build-tag:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v.*/

.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"

.yo-rc.json

@@ -23,6 +23,12 @@
       "requirements": [],
       "debianPackages": [],
       "redhatPackages": []
+    },
+    "promptValues": {
+      "authorName": "The Caleydo Team",
+      "authorEmail": "[email protected]",
+      "authorUrl": "https://caleydo.org",
+      "githubAccount": "phovea"
     }
   }
 }

buildPython.js

@@ -3,8 +3,6 @@
  */
 
 const spawnSync = require('child_process').spawnSync;
-const path = require('path');
-const resolve = path.resolve;
 const fs = require('fs');
 
 function gitHead(cwd) {
@@ -26,7 +24,7 @@ function resolvePlugin(repo, version) {
     }
   }
   // not a git repo
-  return version
+  return version;
 }
 
 function toVersion(v) {
@@ -35,8 +33,8 @@ function toVersion(v) {
   const fmt = now
     .replace(/T/, ' ')
     .replace(/\..+/, '')
-    .replace(/[-:]/,'')
-    .replace(' ','-');
+    .replace(/[-:]/, '')
+    .replace(' ', '-');
   return v.replace('SNAPSHOT', fmt);
 }
 
@@ -55,18 +53,17 @@ function _main() {
     repository: (pkg.repository || {}).url
   };
 
-  const l = ('build/source/' + name).split('/');
+  const l = ('build/source/' + name.toLowerCase()).split('/');
   l.forEach((_, i) => {
     const path = l.slice(0, i + 1).join('/');
     if (!fs.existsSync(path)) {
       fs.mkdirSync(path);
     }
   });
 
-  fs.writeFileSync('build/source/' + name + '/buildInfo.json', JSON.stringify(buildInfo, null, ' '));
+  fs.writeFileSync('build/source/' + name.toLowerCase() + '/buildInfo.json', JSON.stringify(buildInfo, null, ' '));
 }
 
-
 if (require.main === module) {
   _main();
 }

docs/phovea_data_mongo.rst

@@ -0,0 +1,22 @@
+phovea_data_mongo package
+=========================
+
+Submodules
+----------
+
+phovea_data_mongo.graph module
+------------------------------
+
+.. automodule:: phovea_data_mongo.graph
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: phovea_data_mongo
+    :members:
+    :undoc-members:
+    :show-inheritance:

package.json

@@ -2,7 +2,7 @@
   "name": "phovea_data_mongo",
   "description": "Data provider plugin for loading graph data stored in a MongoDB.",
   "homepage": "https://phovea.caleydo.org",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "[email protected]",
@@ -31,7 +31,7 @@
     "pretest": "npm run check",
     "test": "test ! -d tests || python setup.py test",
     "predist": "npm run build && npm run docs",
-    "dist": "python setup.py sdist bdist_wheel",
+    "dist": "python setup.py sdist bdist_wheel && cd build && tar cvzf ../dist/phovea_data_mongo.tar.gz *",
     "docs": "sphinx-apidoc -o docs -f ./phovea_data_mongo && sphinx-build ./docs build/docs",
     "prebuild": "node -e \"process.exit(process.env.PHOVEA_SKIP_TESTS === undefined?1:0)\" || npm run test",
     "build": "rm -rf build/source && find . -name '*.pyc' -delete && node buildPython.js && cp -r ./phovea_data_mongo build/source/"

requirements.txt

@@ -1,2 +1,2 @@
-pymongo==3.0.3
-phovea_server>=2.3.0,<2.4.0
+pymongo~=3.7.1
+phovea_server>=3.0.0,<4.0.0

setup.py

@@ -41,7 +41,7 @@ def to_version(v):
 
 
 setup(
-  name=pkg['name'],
+  name=pkg['name'].lower(),
   version=to_version(pkg['version']),
   url=pkg['homepage'],
   description=pkg['description'],