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

Commit

Permalink
Merge pull request #20 from phovea/release-5.0.0
Browse files Browse the repository at this point in the history
Release 5.0.0
  • Loading branch information
Anita Steiner committed Feb 12, 2021
2 parents d54c1c7 + 3f478d2 commit f939910
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 14 deletions.
54 changes: 47 additions & 7 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 @@ -49,8 +53,34 @@ jobs:
- 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:
Expand All @@ -61,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.*/
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "phovea_processing_similarity",
"description": "Processing queue plugin to compute similarities for categorical data of matrices, tables, and stratifications",
"homepage": "https://phovea.caleydo.org",
"version": "4.0.0",
"version": "5.0.0",
"author": {
"name": "The Caleydo Team",
"email": "contact@caleydo.org",
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
phovea_server>=6.0.0,<7.0.0
phovea_processing_queue>=5.0.0,<6.0.0
phovea_processing_queue>=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

0 comments on commit f939910

Please sign in to comment.