Merge pull request #41 from phovea/release-7.0.0

Release 7.0.0

.circleci/config.yml

@@ -1,9 +1,13 @@
-version: 2
-jobs:
-  build:
+version: 2.1
+
+executors:
+  python-executor:
     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
+jobs:
+  build:
+    executor: python-executor
     steps:
       - checkout
       - run:
@@ -48,8 +52,35 @@ jobs:
             npm run dist
       - store_artifacts:
           path: dist
+          destination: dist
+      - persist_to_workspace:
+          root: ~/phovea
+          paths: .
+  publish:
+    executor: python-executor
+    steps:
+      - attach_workspace:
+          at: ~/phovea
+      - run:
+          name: Install twine
+          command: |
+            virtualenv ~/venv
+            . ~/venv/bin/activate
+            pip install twine
+      - run:
+          name: Authentication
+          command:  |
+            echo -e "[pypi]" >> ~/.pypirc
+            echo -e "repository = $PYPI_REPOSITORY" >> ~/.pypirc
+            echo -e "username = $PYPI_USERNAME" >> ~/.pypirc
+            echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc
+      - run:
+          name: Publish package
+          command: |
+            . ~/venv/bin/activate
+            twine upload dist/*
 workflows:
-  version: 2
+  version: 2.1
 #  build-nightly:
 #    triggers:
 #      - schedule:
@@ -60,17 +91,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.*/

package.json

@@ -2,7 +2,7 @@
   "name": "phovea_data_redis",
   "description": "Data provider plugin for loading data stored in a Redis in-memory database.",
   "homepage": "https://phovea.caleydo.org",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "[email protected]",

phovea_data_redis/assigner.py

@@ -150,7 +150,7 @@ def search(self, idtype, query, max_results=None):
     :param max_results
     :return:
     """
-    query = ''.join(('[' + l + u + ']' for l, u in zip(query.upper(), query.lower())))
+    query = ''.join(('[' + lower + upper + ']' for lower, upper in zip(query.upper(), query.lower())))
     match = self.to_forward_key(idtype, '*' + query + '*')
     keys = [k for k in islice(self._db.scan_iter(match=match), max_results)]
     ids = self._get_entries(keys)

phovea_data_redis/mapping_table.py

@@ -44,7 +44,7 @@ def search(self, query, max_results=None):
     :return:
     """
     db = create_db()
-    query = ''.join(('[' + l + u + ']' for l, u in zip(query.upper(), query.lower())))
+    query = ''.join(('[' + lower + upper + ']' for lower, upper in zip(query.upper(), query.lower())))
     prefix = '{}2{}.'.format(self.from_idtype, self.to_idtype)
     match = '{}*{}*'.format(prefix, query)
     keys = [k for k in islice(db.scan_iter(match=match), max_results)]

requirements.txt

@@ -1,3 +1,3 @@
 redis~=2.10.6
-cachelib==0.1
-phovea_server>=6.0.0,<7.0.0
+cachelib==0.1.1
+phovea_server>=7.0.0,<8.0.0

requirements_dev.txt

@@ -1,6 +1,6 @@
-flake8==3.7.9
-pep8-naming==0.9.1
-pytest==5.3.5
+flake8==3.8.4
+pep8-naming==0.11.1
+pytest==6.1.2
 pytest-runner==5.2
-Sphinx==2.4.2
+Sphinx==3.3.1
 recommonmark==0.6.0