From 069e4930a9ed7792895e8d8bfc731f5c6650f509 Mon Sep 17 00:00:00 2001
From: Daniel Prelipcean <daniel.prelipcean@cern.ch>
Date: Wed, 14 Aug 2019 10:16:22 +0200
Subject: [PATCH] externalbackend: upgraded yadage

Signed-off-by: Daniel Prelipcean <daniel.prelipcean@cern.ch>
---
 reana_workflow_engine_yadage/externalbackend.py | 10 ++++------
 reana_workflow_engine_yadage/version.py         |  2 +-
 setup.py                                        | 14 ++++++--------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/reana_workflow_engine_yadage/externalbackend.py b/reana_workflow_engine_yadage/externalbackend.py
index c923550..86030b7 100644
--- a/reana_workflow_engine_yadage/externalbackend.py
+++ b/reana_workflow_engine_yadage/externalbackend.py
@@ -14,8 +14,8 @@
 import pipes
 
 from packtivity.asyncbackends import PacktivityProxyBase
-from packtivity.syncbackends import (build_job, contextualize_parameters,
-                                     packconfig, publish)
+from packtivity.syncbackends import (build_job, finalize_inputs, packconfig,
+                                     publish)
 from reana_commons.api_client import JobControllerAPIClient as rjc_api_client
 
 from .config import LOGGING_MODULE, MOUNT_CVMFS
@@ -93,8 +93,7 @@ def prepublish(self, spec, parameters, context):
 
     def submit(self, spec, parameters, state, metadata):
         """Submit a yadage packtivity to RJC."""
-        parameters = contextualize_parameters(parameters,
-                                              state)
+        parameters = finalize_inputs(parameters, state)
         job = build_job(spec['process'], parameters, state, self.config)
 
         if 'command' in job:
@@ -155,8 +154,7 @@ def submit(self, spec, parameters, state, metadata):
 
     def result(self, resultproxy):
         """Retrieve the result of a pactivity run by RJC."""
-        resultproxy.pars = contextualize_parameters(resultproxy.pars,
-                                                    resultproxy.state)
+        resultproxy.pars = finalize_inputs(resultproxy.pars, resultproxy.state)
         return publish(
             resultproxy.spec['publisher'],
             resultproxy.pars, resultproxy.state, self.config
diff --git a/reana_workflow_engine_yadage/version.py b/reana_workflow_engine_yadage/version.py
index 9b8410f..5417706 100644
--- a/reana_workflow_engine_yadage/version.py
+++ b/reana_workflow_engine_yadage/version.py
@@ -14,4 +14,4 @@
 
 from __future__ import absolute_import, print_function
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"
diff --git a/setup.py b/setup.py
index 35fddf5..ba86eca 100644
--- a/setup.py
+++ b/setup.py
@@ -41,20 +41,18 @@
 ]
 
 install_requires = [
-    'adage==0.8.5',
+    'adage==0.10.0',
     'click>=7',
     'enum34>=1.1.6',
-    'packtivity==0.10.0',
-    'pyOpenSSL==17.5.0',  # FIXME remove once yadage-schemas solves deps.
+    'jq==0.1.6',
+    'networkx==1.11',
+    'packtivity==0.14.21',
     'reana-commons>=0.6.0.dev20190812,<0.7.0',
     'requests==2.20.0',
-    'rfc3987==1.3.7',  # FIXME remove once yadage-schemas solves deps.
-    'strict-rfc3339==0.7',  # FIXME remove once yadage-schemas solves deps.
     'SQLAlchemy-Utils>=0.32.18',
     'SQLAlchemy>=1.1.14',
-    'yadage-schemas==0.7.16',
-    'yadage==0.13.5',
-    'webcolors==1.7',  # FIXME remove once yadage-schemas solves deps.
+    'yadage==0.20.0',
+    'yadage-schemas==0.10.6',
 ]
 
 packages = find_packages()