testing adding pylint, and calling tests properly

Author: vsoch

.travis.yml

@@ -18,5 +18,6 @@ install:
 #  - cd $TRAVIS_BUILD_DIR/libexec/python && pylint $PWD --errors-only --ignore tests  --disable=E0401,E0611
 
 script:
-  - cd $TRAVIS_BUILD_DIR && python -m unittest singularity/testing/test_build.py
-  - cd $TRAVIS_BUILD_DIR && python -m unittest singularity/testing/test_package.py
+  - cd $TRAVIS_BUILD_DIR/singularity && python -m unittest testing.test_build.py
+  - cd $TRAVIS_BUILD_DIR/singularity && python -m unittest testing.test_package.py
+  - cd $TRAVIS_BUILD_DIR/singularity && pylint $PWD --errors-only --ignore tests  --disable=E0401,E0611

singularity/api.py

@@ -73,7 +73,7 @@ def api_get(url,headers=None,token=None,data=None):
     :param headers: a dictionary with headers for the request
     :param putdata: additional data to add to the request
     '''
-    bot.logger.debug("GET ",url)
+    bot.logger.debug("GET %s",url)
 
     if headers == None:
         headers = get_headers(token=token)
@@ -94,7 +94,7 @@ def api_put(url,headers=None,token=None,data=None):
     :param headers: a dictionary with headers for the request
     :param data: additional data to add to the request
     '''
-    bot.logger.debug("PUT ",url)
+    bot.logger.debug("PUT %s",url)
 
     if headers == None:
         headers = get_headers(token=token)
@@ -115,7 +115,7 @@ def api_post(url,headers=None,data=None,token=None):
     :param headers: a dictionary with headers for the request
     :param data: additional data to add to the request
     '''
-    bot.logger.debug("POST ",url)
+    bot.logger.debug("POST %s",url)
 
     if headers == None:
         headers = get_headers(token=token)

singularity/runscript.py

@@ -85,16 +85,9 @@ def get_runscript_parameters(runscript,name,version,description=None):
 
     if language == 'python':
         params = get_parameters_python(runscript)
+        # TODO: here we would write something like boutiqes spec
 
-    # Finally, make a boutiques json object with the parameters
-    if params != None:
-        json_spec = get_boutiques_json(name=name,
-                                       version=version,
-                                       inputs=params,
-                                       command=name,
-                                       description=description)
-
-    return json_spec
+    return params
 
 
 def get_parameters_python(runscript):

singularity/testing/test_views.py

@@ -231,9 +231,9 @@ def read_file(filename,mode="r"):
 def remove_unicode_dict(input_dict):
     '''remove unicode keys and values from dict, encoding in utf8
     '''
-    if isinstance(input_dict, basestring):
-        return str(input_dict)
-    elif isinstance(input_dict, collections.Mapping):
+    #if isinstance(input_dict, basestring):
+    #    return str(input_dict)
+    if isinstance(input_dict, collections.Mapping):
         return dict(map(remove_unicode_dict, input_dict.iteritems()))
     elif isinstance(input_dict, collections.Iterable):
         return type(input_dict)(map(remove_unicode_dict, input_dict))

singularity/utils.py

@@ -204,6 +204,7 @@ def make_container_tree(folders,files,path_delim="/",parse_files=True):
 
     # Now make the graph, we simply append children to their parents
     seen = []
+    graph = []
     iters = list(range(max_depth+1)) # 0,1,2,3...
     iters.reverse()            # ...3,2,1,0
     iters.pop()                # remove 0
@@ -219,7 +220,6 @@ def make_container_tree(folders,files,path_delim="/",parse_files=True):
                 nodes[parent_id]["children"].append(child_node)
 
     # Now add the parents to graph, with name as main lookup
-    graph = []
     for parent,parent_info in nodes.items():
         graph.append(parent_info)
     graph = {"name":"base","children":graph}