Skip to content
This repository has been archived by the owner on Jan 29, 2024. It is now read-only.

Commit

Permalink
Merge 5d39058 into c51c086
Browse files Browse the repository at this point in the history
  • Loading branch information
tiborsimko committed Jun 9, 2020
2 parents c51c086 + 5d39058 commit a6202d0
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ matrix:
before_install:
- pip install -r requirements-dev.txt
- travis_retry pip install --upgrade pip setuptools py
- travis_retry pip install twine wheel coveralls requirements-builder
- travis_retry pip install twine wheel coveralls requirements-builder==0.3.0 click==7.0
- requirements-builder -e $EXTRAS --level=min setup.py > .travis-lowest-requirements.txt
- requirements-builder -e $EXTRAS --level=pypi setup.py > .travis-release-requirements.txt
- requirements-builder -e $EXTRAS --level=dev --req requirements-dev.txt setup.py > .travis-devel-requirements.txt
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changes
=======

Version 0.6.1 (2020-06-09)
--------------------------

- Fixes installation troubles for REANA 0.6.x release series by pinning
several dependencies.

Version 0.6.0 (2019-12-27)
--------------------------

Expand Down
16 changes: 8 additions & 8 deletions docs/gettingstarted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Are you looking at installing and deploying REANA cluster locally on your laptop

.. code-block:: console
$ minikube start --feature-gates="TTLAfterFinished=true"
$ minikube start --vm-driver=virtualbox --feature-gates="TTLAfterFinished=true"
3. Install REANA-Cluster sources. You probably want to use a virtual environment:

Expand Down Expand Up @@ -155,7 +155,7 @@ Deploy on CERN infrastructure
8. Create your own ``reana-cluster.yaml``. For instance, to deploy REANA
``0.6.0`` at CERN with 200 GB Ceph volume and having as URL
``0.6.1`` at CERN with 200 GB Ceph volume and having as URL
``reana-dev.cern.ch`` the file, ``reana-cluster-CERN.yaml``, would look
like follows:

Expand All @@ -182,17 +182,17 @@ Deploy on CERN infrastructure
components:
reana-workflow-controller:
type: "docker"
image: "reanahub/reana-workflow-controller:0.6.0"
image: "reanahub/reana-workflow-controller:0.6.1"
environment:
- <<: *db_base_config
- REANA_JOB_CONTROLLER_IMAGE: "reanahub/reana-job-controller:0.6.0"
- REANA_WORKFLOW_ENGINE_IMAGE_CWL: "reanahub/reana-workflow-engine-cwl:0.6.0"
- REANA_WORKFLOW_ENGINE_IMAGE_YADAGE: "reanahub/reana-workflow-engine-yadage:0.6.0"
- REANA_WORKFLOW_ENGINE_IMAGE_SERIAL: "reanahub/reana-workflow-engine-serial:0.6.0"
- REANA_JOB_CONTROLLER_IMAGE: "reanahub/reana-job-controller:0.6.1"
- REANA_WORKFLOW_ENGINE_IMAGE_CWL: "reanahub/reana-workflow-engine-cwl:0.6.1"
- REANA_WORKFLOW_ENGINE_IMAGE_YADAGE: "reanahub/reana-workflow-engine-yadage:0.6.1"
- REANA_WORKFLOW_ENGINE_IMAGE_SERIAL: "reanahub/reana-workflow-engine-serial:0.6.1"
reana-server:
type: "docker"
image: "reanahub/reana-server:0.6.0"
image: "reanahub/reana-server:0.6.1"
environment:
- <<: *db_base_config
Expand Down
12 changes: 6 additions & 6 deletions reana_cluster/configurations/reana-cluster-minikube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ cluster:
components:
reana-workflow-controller:
type: "docker"
image: "reanahub/reana-workflow-controller:0.6.0"
image: "reanahub/reana-workflow-controller:0.6.1"
environment:
- <<: *db_base_config
- SHARED_VOLUME_PATH: "/var/reana"
- REANA_JOB_CONTROLLER_IMAGE: "reanahub/reana-job-controller:0.6.0"
- REANA_WORKFLOW_ENGINE_IMAGE_CWL: "reanahub/reana-workflow-engine-cwl:0.6.0"
- REANA_WORKFLOW_ENGINE_IMAGE_YADAGE: "reanahub/reana-workflow-engine-yadage:0.6.0"
- REANA_WORKFLOW_ENGINE_IMAGE_SERIAL: "reanahub/reana-workflow-engine-serial:0.6.0"
- REANA_JOB_CONTROLLER_IMAGE: "reanahub/reana-job-controller:0.6.1"
- REANA_WORKFLOW_ENGINE_IMAGE_CWL: "reanahub/reana-workflow-engine-cwl:0.6.1"
- REANA_WORKFLOW_ENGINE_IMAGE_YADAGE: "reanahub/reana-workflow-engine-yadage:0.6.1"
- REANA_WORKFLOW_ENGINE_IMAGE_SERIAL: "reanahub/reana-workflow-engine-serial:0.6.1"

reana-server:
type: "docker"
image: "reanahub/reana-server:0.6.0"
image: "reanahub/reana-server:0.6.1"
environment:
- <<: *db_base_config

Expand Down
2 changes: 1 addition & 1 deletion reana_cluster/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

from __future__ import absolute_import, print_function

__version__ = "0.6.0"
__version__ = "0.6.1"
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
history = open('CHANGES.rst').read()

tests_require = [
'reana-db>=0.6.0,<0.7.0',
'pytest-reana>=0.6.0,<0.7.0',
]

Expand All @@ -45,7 +46,7 @@
'click>=7',
'Jinja2>=2.9.6,<2.11',
'PyYAML>=5.1',
'reana-commons[kubernetes]>=0.6.0,<0.7.0',
'reana-commons[kubernetes]>=0.6.1,<0.7.0',
'tablib>=0.12.1,<0.13',
]

Expand Down

0 comments on commit a6202d0

Please sign in to comment.