From 01fcf0e4dfa3153d3725edf53a2ed4e711ecedd2 Mon Sep 17 00:00:00 2001 From: Dinos Kousidis Date: Thu, 9 Aug 2018 15:22:33 +0200 Subject: [PATCH] release: v0.3.0 Signed-off-by: Dinos Kousidis --- CHANGES.rst | 8 ++++++++ Dockerfile | 3 --- docs/requirements.txt | 2 -- reana_job_controller/app.py | 9 +-------- reana_job_controller/spec.py | 2 -- reana_job_controller/version.py | 2 +- requirements-dev.txt | 2 -- setup.py | 4 ++-- 8 files changed, 12 insertions(+), 20 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index ad1d0dda..2746f5e2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,14 @@ Changes ======= +Version 0.3.0 (2018-08-10) +-------------------------- + +- Adds uwsgi for production deployments. +- Switches from pykube to official Kubernetes python client. +- Adds compatibility with latest Kubernetes. + + Version 0.2.0 (2018-04-19) -------------------------- diff --git a/Dockerfile b/Dockerfile index 61efadae..ce0817bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,6 @@ RUN apt-get update && \ apt-get install -y vim-tiny && \ pip install --upgrade pip -RUN pip install -e git://github.com/reanahub/reana-commons.git@master#egg=reana-commons -RUN pip install -e git://github.com/reanahub/reana-db.git@master#egg=reana-db - COPY CHANGES.rst README.rst setup.py /code/ COPY reana_job_controller/version.py /code/reana_job_controller/ WORKDIR /code diff --git a/docs/requirements.txt b/docs/requirements.txt index 5d3d7ed2..d776d8c4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -18,6 +18,4 @@ # granted to it by virtue of its status as an Intergovernmental Organization or # submit itself to any jurisdiction. --e git+git://github.com/reanahub/reana-commons.git#egg=reana-commons --e git+git://github.com/reanahub/reana-db.git@master#egg=reana-db -e .[all] diff --git a/reana_job_controller/app.py b/reana_job_controller/app.py index b43a4ff8..eb096273 100644 --- a/reana_job_controller/app.py +++ b/reana_job_controller/app.py @@ -245,10 +245,6 @@ def get_jobs(): # noqa } } """ - # FIXME do Marshmallow validation after fixing the structure - # of job list. Now it has the ID as key, it should be a plain - # list of jobs so it can be validated with Marshmallow. - return jsonify({"jobs": retrieve_all_jobs()}), 200 @@ -453,10 +449,7 @@ def get_logs(job_id): # noqa @app.route('/apispec', methods=['GET']) def get_openapi_spec(): - """Get OpenAPI Spec. - - FIXME add openapi spec - """ + """Get OpenAPI Spec.""" return jsonify(app.config['OPENAPI_SPEC']) diff --git a/reana_job_controller/spec.py b/reana_job_controller/spec.py index 3773e2d4..1e8a2dda 100644 --- a/reana_job_controller/spec.py +++ b/reana_job_controller/spec.py @@ -31,8 +31,6 @@ def build_openapi_spec(): """Create OpenAPI definition.""" - # Create OpenAPI specification object - # FIXME set `title`, `version` ... as parameters spec = APISpec( title='reana-job-controller', version='0.0.1', diff --git a/reana_job_controller/version.py b/reana_job_controller/version.py index d3e5bac6..1a399ba5 100644 --- a/reana_job_controller/version.py +++ b/reana_job_controller/version.py @@ -28,4 +28,4 @@ from __future__ import absolute_import, print_function -__version__ = "0.3.0.dev20180503" +__version__ = "0.3.0" diff --git a/requirements-dev.txt b/requirements-dev.txt index 17e7638d..d4e6008b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,3 @@ wdb ipdb Flask-DebugToolbar -git+git://github.com/reanahub/reana-commons.git@master#egg=reana-commons -git+git://github.com/reanahub/reana-db.git@master#egg=reana-db diff --git a/setup.py b/setup.py index 72ddb4ab..b184df40 100644 --- a/setup.py +++ b/setup.py @@ -69,8 +69,8 @@ 'Flask>=0.11', 'kubernetes>=6.0.0', 'marshmallow>=2.13', - 'reana-commons>=0.1.0', - 'reana-db>=0.1.0', + 'reana-commons>=0.3.0', + 'reana-db>=0.3.0', ] packages = find_packages()