fix(requirments): update requirments.txt

dev-requirements.txt

@@ -9,8 +9,6 @@ codacy-coverage
 moto==0.4.5
 Sphinx==1.3.1
 sphinxcontrib-httpdomain==1.3.0
--e git+https://git@github.com/uc-cdis/indexclient.git@1.0#egg=indexclient
--e git+https://git@github.com/NCI-GDC/signpost.git@c8e2aa5ff572c808cba9b522b64f7b497e79c524#egg=signpost
 -e git+https://git@github.com/uc-cdis/cdisutils-test.git@0.0.1#egg=cdisutilstest
 -e git+https://git@github.com/uc-cdis/flask-postgres-session.git@0.1.1#egg=flask_postgres_session
 # dependency of sheepdog
@@ -20,4 +18,4 @@ envelopes==0.4
 pyasn1-modules==0.0.11
 urllib3==1.22
 -e git+https://github.com/uc-cdis/cirrus.git@0.0.0#egg=cirrus-0.0.0
--e git+https://git@github.com/uc-cdis/fence.git@1.1.1#egg=fence
+-e git+https://git@github.com/uc-cdis/fence.git@1.1.1#egg=fence

peregrine/utils/pybdbag.py

@@ -23,10 +23,10 @@ def get_node_set(nodetype):
 
 
 def is_category(node_name, data_files):
-    if node_name in data_files or (node_name + 's') in data_files:
-        return True
-    else:
-        return False
+    for item in data_files:
+        if node_name.find(item)>=0:
+            return True
+    return False
 
 
 def is_uuid(uuid):
@@ -66,7 +66,7 @@ def create_bdbag(bag_info, payload, max_row=1000):
                 if (dict_row[key] is not None and dict_row[key] != []):
                     header_set.update([key])
                     words = key.split('-')
-                    if len(words) > 1 and is_category(words[-2], data_files):
+                    if (len(words) > 1 and is_category(words[-2], data_files) or len(words) > 2 and is_category(words[-3], data_files)):
                         data_file_headers.update([key])
 
         for dict_row in json_data:

requirements.txt

@@ -45,4 +45,4 @@ Flask-SQLAlchemy-Session==1.1
 -e git+https://git@github.com/uc-cdis/cdislogging.git@master#egg=cdislogging
 -e git+https://git@github.com/uc-cdis/authutils.git@1.1.2#egg=authutils
 -e git+https://git@github.com/uc-cdis/indexclient.git@1.0#egg=indexclient
--e git+https://git@github.com/NCI-GDC/signpost.git@c8e2aa5ff572c808cba9b522b64f7b497e79c524#egg=signpost
+-e git+https://git@github.com/NCI-GDC/signpost.git@c8e2aa5ff572c808cba9b522b64f7b497e79c524#egg=signpost