From 5b057b764171d8a1e1717ac55a86c8280a65116b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 31 Jul 2020 13:42:45 +0200 Subject: [PATCH 1/7] prepare next development version 5.0.1-SNAPSHOT --- package.json | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a661a10..d425ec1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "taco_server", "description": "The server part for comparing large tabular data using Phovea", - "version": "5.0.0", + "version": "5.0.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", diff --git a/requirements.txt b/requirements.txt index a10b915..b318357 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ sklearn==0.0 -phovea_server>=6.0.0,<7.0.0 \ No newline at end of file +-e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server \ No newline at end of file From b3b05a0614e15fbf8cfc4d045c85cf587bc91287 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 8 Jan 2021 11:01:51 +0100 Subject: [PATCH 2/7] update requirements and switch branches --- requirements.txt | 2 +- requirements_dev.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index b318357..44cc867 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ sklearn==0.0 --e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server \ No newline at end of file +-e git+https://github.com/phovea/phovea_server.git@vstoiber/logging_behaviour_and_dependencies#egg=phovea_server \ No newline at end of file diff --git a/requirements_dev.txt b/requirements_dev.txt index f34272b..10476e2 100644 --- a/requirements_dev.txt +++ b/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 From 18e528022460251da7f88b3329627769898164c5 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Sat, 23 Jan 2021 14:00:41 +0100 Subject: [PATCH 3/7] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 44cc867..12f78a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ sklearn==0.0 --e git+https://github.com/phovea/phovea_server.git@vstoiber/logging_behaviour_and_dependencies#egg=phovea_server \ No newline at end of file +-e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server From 2ffbaf9cbab612e114ee83394b8f3b946b72bee6 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 28 Jan 2021 09:27:58 +0100 Subject: [PATCH 4/7] prepare release_6.0.0 --- package.json | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d425ec1..fa9143d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "taco_server", "description": "The server part for comparing large tabular data using Phovea", - "version": "5.0.1-SNAPSHOT", + "version": "6.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", diff --git a/requirements.txt b/requirements.txt index 12f78a5..8735907 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ sklearn==0.0 --e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server +phovea_server>=release-7.0.0, Date: Thu, 28 Jan 2021 09:28:33 +0100 Subject: [PATCH 5/7] fix branches --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8735907..e0cb4a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ sklearn==0.0 -phovea_server>=release-7.0.0, Date: Mon, 15 Feb 2021 07:40:31 +0100 Subject: [PATCH 6/7] Update config.yml --- .circleci/config.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc4de12..0c953d8 100644 --- a/.circleci/config.yml +++ b/.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: @@ -50,7 +54,7 @@ jobs: path: dist destination: dist workflows: - version: 2 + version: 2.1 # build-nightly: # triggers: # - schedule: @@ -61,17 +65,9 @@ workflows: # - develop # jobs: # - build - build-branch: - jobs: - - build: - filters: - tags: - ignore: /^v.*/ - build-tag: + build-branches-and-tags: jobs: - build: filters: - branches: - ignore: /.*/ tags: - only: /^v.*/ + only: /.*/ From d6fd0cfa2c1867b2228b236ab8bd02d5969393a1 Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Mon, 15 Feb 2021 07:40:56 +0100 Subject: [PATCH 7/7] changes for release 6.0.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e0cb4a0..84c79de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ sklearn==0.0 --e git+https://github.com/phovea/phovea_server.git@release-7.0.0#egg=phovea_server \ No newline at end of file +phovea_server>=7.0.0,<8.0.0 \ No newline at end of file