global: addition of requirements-devel.txt

* ADDS requirements-devel.txt and modifies .travis.yml to use requirements-builder Signed-off-by: Dinos Kousidis <[email protected]>
reanahub · Apr 19, 2018 · 7d0d012 · 7d0d012
1 parent 3b9f994
commit 7d0d012
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,11 @@ language: python
 cache:
   - pip
 
+env:
+  - REQUIREMENTS=lowest EXTRAS=all
+  - REQUIREMENTS=release EXTRAS=all
+  - REQUIREMENTS=devel EXTRAS=all
+
 python:
   - "2.7"
 
@@ -36,10 +41,14 @@ matrix:
 
 before_install:
   - travis_retry pip install --upgrade pip setuptools py
-  - travis_retry pip install twine wheel coveralls
+  - travis_retry pip install twine wheel coveralls requirements-builder
+  - 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-devel.txt setup.py > .travis-devel-requirements.txt
 
 install:
-  - travis_retry pip install -e .[all]
+  - travis_retry pip install -r .travis-${REQUIREMENTS}-requirements.txt
+  - travis_retry pip install -e .[$EXTRAS]
 
 script:
   - ./run-tests.sh

diff --git a/reana_client/cli/cwl_runner.py b/reana_client/cli/cwl_runner.py
@@ -141,8 +141,6 @@ def cwl_runner(client, quiet, outdir, processfile, jobfile):
 
 def upload_files(client, input_structure, jobfile, workflow_id):
     """Recursively find and upload input files and directories from CWL job."""
-    import ipdb
-    ipdb.set_trace()
     if type(input_structure) is dict:
         if type(input_structure) is dict and \
            input_structure.get('class', None) == 'File':
@@ -224,8 +222,6 @@ def upload_files_from_cwl_tool(client, spec, spec_file, workflow_id):
     Traverse through tool inputs and workflow steps to collect and upload all
     file inputs.
     """
-    import ipdb
-    ipdb.set_trace()
     if spec['inputs']:
         for param in spec['inputs']:
             if param['type'] == "File":
@@ -236,10 +232,9 @@ def upload_files_from_cwl_tool(client, spec, spec_file, workflow_id):
                 directory = os.path.abspath(os.path.dirname(spec_file))
                 for file in os.listdir(directory):
                     if any(file.endswith(ext) for ext in extensions):
-                        # transfer_file(client, {"location": os.path.join(
-                        #     directory, file)}, spec_file, workflow_id)
-                        transfer_file(client, {"location": os.path.join(file)},
-                                      spec_file, workflow_id)
+                        transfer_file(client, {"location": os.path.join(
+                            directory, file)}, spec_file, workflow_id)
+
     if spec.get("steps"):
         for tool in spec['steps']:
             for param in tool['in']:

diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of REANA.
+# Copyright (C) 2018 CERN.
+#
+# REANA is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# REANA is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# REANA; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307, USA.
+#
+# In applying this license, CERN does not waive the privileges and immunities
+# 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
diff --git a/setup.py b/setup.py
@@ -66,14 +66,13 @@
 install_requires = [
     'bravado>=9.0.6',
     'click>=6.7',
-    'cwltool',
+    'cwltool>=1.0.20180330141240',
     'yadage-schemas==0.7.16',
     'pyOpenSSL==17.3.0',  # FIXME remove once yadage-schemas solves deps.
     'rfc3987==1.3.7',  # FIXME remove once yadage-schemas solves deps.
     'strict-rfc3339==0.7',  # FIXME remove once yadage-schemas solves deps.
     'tablib>=0.12.1',
     'webcolors==1.7',  # FIXME remove once yadage-schemas solves deps.
-    'reana-commons',
 ]
 
 packages = find_packages()