Merge 44d577c into 501c2a7

.travis.yml

@@ -35,6 +35,7 @@ services:
   - docker
 
 before_install:
+  - pip install -r requirements-dev.txt
   - travis_retry pip install --upgrade pip setuptools py
   - travis_retry pip install twine wheel coveralls
 

Dockerfile

@@ -25,7 +25,8 @@ 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/diegodelemos/reana-commons.git@extract-db-to-reana-db#egg=reana-commons
+RUN pip install -e git://github.com/diegodelemos/reana-db.git@initial-db-moved-from-commons#egg=reana-db
 
 COPY CHANGES.rst README.rst setup.py /code/
 COPY reana_job_controller/version.py /code/reana_job_controller/

reana_job_controller/app.py

@@ -28,12 +28,12 @@
 import threading
 
 from flask import Flask, jsonify, request
-from reana_commons.database import Session
-from reana_commons.models import Job as JobTable
-from reana_commons.models import JobCache
 from reana_commons.utils import (calculate_file_access_time,
                                  calculate_hash_of_dir,
                                  calculate_job_input_hash)
+from reana_db.database import Session
+from reana_db.models import Job as JobTable
+from reana_db.models import JobCache
 
 from reana_job_controller.k8s import (create_api_client, instantiate_job,
                                       watch_jobs)

reana_job_controller/k8s.py

@@ -33,8 +33,8 @@
 from kubernetes import config as k8s_config
 from kubernetes import watch
 from kubernetes.client.models.v1_delete_options import V1DeleteOptions
-from reana_commons.database import Session
-from reana_commons.models import Job
+from reana_db.database import Session
+from reana_db.models import Job
 
 from reana_job_controller import config, volume_templates
 

requirements-dev.txt

@@ -1,4 +1,5 @@
 wdb
 ipdb
 Flask-DebugToolbar
-git+git://github.com/reanahub/reana-commons.git#egg=reana-commons
+git+git://github.com/diegodelemos/reana-commons.git@extract-db-to-reana-db#egg=reana-commons
+git+git://github.com/diegodelemos/reana-db.git@initial-db-moved-from-commons#egg=reana-db

setup.py

@@ -70,6 +70,7 @@
     'kubernetes>=6.0.0',
     'marshmallow>=2.13',
     'reana-commons>=0.1.0',
+    'reana-db>=0.1.0',
 ]
 
 packages = find_packages()