dxpy 0.386.0__tar.gz → 0.387.0__tar.gz

{dxpy-0.386.0 → dxpy-0.387.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.386.0
+Version: 0.387.0
 Summary: DNAnexus Platform API bindings for Python
 Home-page: https://github.com/dnanexus/dx-toolkit
 Author: Aleksandra Zalcman, Andrey Kislyuk, Anurag Biyani, Geet Duggal, Katherine Lai, Kurt Jensen, Marek Hrvol, Ohad Rodeh, Phil Sung

{dxpy-0.386.0 → dxpy-0.387.0}/dxpy/scripts/dx.py

@@ -2481,7 +2481,7 @@ def find_data(args):
                                          visibility=args.visibility,
                                          properties=args.properties,
                                          name=args.name,
-                                         name_mode='glob',
+                                         name_mode=args.name_mode,
                                          typename=args.type,
                                          tags=args.tag, link=args.link,
                                          project=args.project,
@@ -6143,7 +6143,8 @@ parser_find_data.add_argument('--class', dest='classname', choices=['record', 'f
 )
 parser_find_data.add_argument('--state', choices=['open', 'closing', 'closed', 'any'], help='State of the object')
 parser_find_data.add_argument('--visibility', choices=['hidden', 'visible', 'either'], default='visible', help='Whether the object is hidden or not')
-parser_find_data.add_argument('--name', help='Name of the object')
+parser_find_data.add_argument('--name', help='Search criteria for the object name, interpreted according to the --name-mode')
+parser_find_data.add_argument('--name-mode', default='glob', help='Name mode to use for searching', choices=['glob', 'exact', 'regexp'])
 parser_find_data.add_argument('--type', help='Type of the data object')
 parser_find_data.add_argument('--link', help='Object ID that the data object links to')
 parser_find_data.add_argument('--all-projects', '--allprojects', help='Extend search to all projects (excluding public projects)', action='store_true')

dxpy-0.387.0/dxpy/toolkit_version.py

@@ -0,0 +1 @@
+version = '0.387.0'

{dxpy-0.386.0 → dxpy-0.387.0}/dxpy/utils/__init__.py

@@ -292,10 +292,10 @@ class Nonce:
     '''
     def __init__(self):
         try:
-            self.nonce = "%s%f" % (str(binascii.hexlify(os.urandom(32))), time.time())
+            self.nonce = "%s%f" % (binascii.hexlify(os.urandom(32)).decode('utf-8'), time.time())
         except:
             random.seed(time.time())
-            self.nonce = "%s%f" % (str(random.getrandbits(8*26)), time.time())
+            self.nonce = "%s%f" % (random.getrandbits(8*26), time.time())
 
     def __str__(self):
         return self.nonce

{dxpy-0.386.0 → dxpy-0.387.0}/dxpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.386.0
+Version: 0.387.0
 Summary: DNAnexus Platform API bindings for Python
 Home-page: https://github.com/dnanexus/dx-toolkit
 Author: Aleksandra Zalcman, Andrey Kislyuk, Anurag Biyani, Geet Duggal, Katherine Lai, Kurt Jensen, Marek Hrvol, Ohad Rodeh, Phil Sung

{dxpy-0.386.0 → dxpy-0.387.0}/test/test_dxpy.py

@@ -139,7 +139,7 @@ class TestDXProject(unittest.TestCase):
             self.assertEqual(desc["databaseUIViewOnly"], False)
             self.assertEqual(desc["externalUploadRestricted"], False)
             self.assertEqual(desc["tags"], [])
-            self.assertTrue("databaseResultsRestricted" not in desc)
+            self.assertEqual(desc["databaseResultsRestricted"], None)
             prop = dxpy.api.project_describe(dxproject.get_id(),
                                              {'fields': {'properties': True}})
             self.assertEqual(prop['properties'], {})
@@ -212,8 +212,8 @@ class TestDXProject(unittest.TestCase):
         desc = dxproject.describe()
         self.assertEqual(desc["restricted"], False)
         self.assertEqual(desc["downloadRestricted"], False)
-        self.assertTrue("allowedExecutables" not in desc)
-        self.assertTrue("databaseResultsRestricted" not in desc)
+        self.assertEqual(desc["allowedExecutables"], None)
+        self.assertEqual(desc["databaseResultsRestricted"], None)
 
     def test_new_list_remove_folders(self):
         dxproject = dxpy.DXProject()

dxpy-0.386.0/dxpy/toolkit_version.py

@@ -1 +0,0 @@
-version = '0.386.0'