From 3e4b5b8e7cf6bee1a973ff7b5dfdc9bf843fd4d6 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 4 Feb 2021 10:23:33 +0100 Subject: [PATCH 1/5] update codeowner --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9836a90..725f3b4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @thinkh +* @anita-steiner From 79484e0458d7b41ad0a61b0355eb890d0f1948af Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Fri, 12 Feb 2021 17:11:46 +0100 Subject: [PATCH 2/5] changes for release 6.0.0 --- package.json | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3d7d3e6..16f1a90 100644 --- a/package.json +++ b/package.json @@ -60,12 +60,12 @@ "iojs": ">= 3" }, "dependencies": { - "phovea_core": "^6.0.0" + "phovea_core": "github:phovea/phovea_core#develop" }, "name": "phovea_processing_queue", "description": "Process long-running tasks in the background using Celery.", "homepage": "https://phovea.caleydo.org", - "version": "6.0.0", + "version": "6.0.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", diff --git a/requirements.txt b/requirements.txt index a5b35be..e78ad15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ celery[redis,auth,msgpack]==4.2.2 -phovea_data_redis>=7.0.0,<8.0.0 -phovea_server>=7.0.0,<8.0.0 \ No newline at end of file +-e git+https://github.com/phovea/phovea_data_redis.git@develop#egg=phovea_data_redis +-e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server \ No newline at end of file From e16a7705bcccce12c75531bf65bb40d6f150c4ba Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 15 Feb 2021 09:39:38 +0100 Subject: [PATCH 3/5] update .circleci config --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f9fe15..187d070 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,6 +50,10 @@ jobs: - run: name: Show installed pip packages command: pip list || true + - run: + name: Remove all from dist folder + command: | + rm -rf dist && mkdir dist - run: name: Build command: | @@ -66,6 +70,7 @@ jobs: steps: - attach_workspace: at: ~/. + - run: ls -a - run: name: Install twine command: | @@ -125,6 +130,7 @@ jobs: steps: - attach_workspace: at: ~/. + - run: ls -a - run: name: Authentication command: | @@ -190,4 +196,4 @@ workflows: branches: ignore: /.*/ tags: - only: /^v.*/ + only: /^v.*/ \ No newline at end of file From 0249d73b39e81bcf7f81955b102668a7080a19d5 Mon Sep 17 00:00:00 2001 From: Vanessa Stoiber <52395160+dvvanessastoiber@users.noreply.github.com> Date: Wed, 8 Sep 2021 09:47:47 +0200 Subject: [PATCH 4/5] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 725f3b4..ab31662 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @anita-steiner +* @phovea/core @phovea/datavisyn-core From 13505885f0c8f7603a5d164e604e234e7823e783 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 8 Sep 2021 10:27:56 +0200 Subject: [PATCH 5/5] prepare release_6.1.0 --- package.json | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 16f1a90..f1cb6b9 100644 --- a/package.json +++ b/package.json @@ -60,12 +60,12 @@ "iojs": ">= 3" }, "dependencies": { - "phovea_core": "github:phovea/phovea_core#develop" + "phovea_core": "^7.0.0" }, "name": "phovea_processing_queue", "description": "Process long-running tasks in the background using Celery.", "homepage": "https://phovea.caleydo.org", - "version": "6.0.1-SNAPSHOT", + "version": "6.1.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", diff --git a/requirements.txt b/requirements.txt index e78ad15..5be9d26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ celery[redis,auth,msgpack]==4.2.2 --e git+https://github.com/phovea/phovea_data_redis.git@develop#egg=phovea_data_redis --e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server \ No newline at end of file +phovea_data_redis>=7.2.0,<8.0.0 +phovea_server>=7.2.0,<8.0.0 \ No newline at end of file