Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Release 6.0.0 #35

Merged
8 commits merged into from
Feb 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -50,7 +54,7 @@ jobs:
path: dist
destination: dist
workflows:
version: 2
version: 2.1
# build-nightly:
# triggers:
# - schedule:
Expand All @@ -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: /.*/
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "taco_server",
"description": "The server part for comparing large tabular data using Phovea",
"version": "5.0.0",
"version": "6.0.0",
"author": {
"name": "The Caleydo Team",
"email": "contact@caleydo.org",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sklearn==0.0
phovea_server>=6.0.0,<7.0.0
phovea_server>=7.0.0,<8.0.0
8 changes: 4 additions & 4 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -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