dxpy 0.382.0__tar.gz → 0.384.0__tar.gz

{dxpy-0.382.0 → dxpy-0.384.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.382.0
+Version: 0.384.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.382.0 → dxpy-0.384.0}/dxpy/scripts/dx.py

@@ -1185,12 +1185,11 @@ def describe(args):
         # Always retrieve details too (just maybe don't render them)
         json_input["details"] = True
         if is_data_obj_id(args.path):
-            # Should prefer the current project's version if possible
+            # Prefer the current project's version if possible
             if dxpy.WORKSPACE_ID is not None:
                 try:
-                    # But only put it in the JSON if you still have
-                    # access.
-                    dxpy.api.project_list_folder(dxpy.WORKSPACE_ID)
+                    # But only put it in the JSON if you still have access
+                    dxpy.api.project_describe(dxpy.WORKSPACE_ID, input_params={"fields": {"id": True}})
                     json_input['project'] = dxpy.WORKSPACE_ID
                 except dxpy.DXAPIError as e:
                     if not isinstance(e, ResourceNotFound):
@@ -1512,14 +1511,18 @@ def set_visibility(args):
 
 def get_details(args):
     # Attempt to resolve name
-    _project, _folderpath, entity_result = try_call(resolve_existing_path,
+    project, _folderpath, entity_result = try_call(resolve_existing_path,
                                                     args.path, expected='entity')
 
     if entity_result is None:
         err_exit(fill('Could not resolve "' + args.path + '" to a name or ID'), 3)
+    
+    input_params = {}
+    if project is not None:
+        input_params['project'] = project
 
     try:
-        print(json.dumps(dxpy.DXHTTPRequest('/' + entity_result['id'] + '/getDetails', {}), indent=4))
+        print(json.dumps(dxpy.DXHTTPRequest('/' + entity_result['id'] + '/getDetails', input_params), indent=4))
     except:
         err_exit()
 

dxpy-0.384.0/dxpy/toolkit_version.py

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

{dxpy-0.382.0 → dxpy-0.384.0}/dxpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.382.0
+Version: 0.384.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.382.0 → dxpy-0.384.0}/test/test_dxclient.py

@@ -6799,6 +6799,7 @@ class TestDXClientNewUser(DXTestCase):
         exp = {
             "level": "MEMBER",
             "allowBillableActivities": False,
+            "cloudIntegrationManagement": False,
             "appAccess": True,
             "projectAccess": "CONTRIBUTE",
             "id": user_id
@@ -6817,6 +6818,7 @@ class TestDXClientNewUser(DXTestCase):
         exp = {
             "level": "MEMBER",
             "allowBillableActivities": False,
+            "cloudIntegrationManagement": False,
             "appAccess": True,
             "projectAccess": "CONTRIBUTE",
             "id": user_id
@@ -6833,6 +6835,7 @@ class TestDXClientNewUser(DXTestCase):
         exp = {
             "level": "MEMBER",
             "allowBillableActivities": True,
+            "cloudIntegrationManagement": False,
             "appAccess": False,
             "projectAccess": "VIEW",
             "id": user_id
@@ -6850,6 +6853,7 @@ class TestDXClientNewUser(DXTestCase):
         exp = {
             "level": "ADMIN",
             "allowBillableActivities": True,
+            "cloudIntegrationManagement": False,
             "appAccess": True,
             "projectAccess": "ADMINISTER",
             "id": user_id
@@ -6871,6 +6875,7 @@ class TestDXClientNewUser(DXTestCase):
         exp = {
             "level": "MEMBER",
             "allowBillableActivities": True,
+            "cloudIntegrationManagement": False,
             "appAccess": True,
             "projectAccess": "VIEW",
             "id": user_id
@@ -6887,6 +6892,7 @@ class TestDXClientNewUser(DXTestCase):
         exp = {
             "level": "ADMIN",
             "allowBillableActivities": True,
+            "cloudIntegrationManagement": False,
             "appAccess": True,
             "projectAccess": "ADMINISTER",
             "id": user_id
@@ -6962,6 +6968,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)
@@ -6973,6 +6980,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "MEMBER",
                           "allowBillableActivities": False,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "CONTRIBUTE"}
         membership = self._org_find_members(self.user_id)
@@ -6986,6 +6994,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)
@@ -6998,6 +7007,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "MEMBER",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": False,
                           "projectAccess": "NONE"}
         membership = self._org_find_members(self.user_id)
@@ -7031,6 +7041,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)
@@ -7046,6 +7057,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)
@@ -7093,6 +7105,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)
@@ -7155,6 +7168,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)
@@ -7165,6 +7179,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "MEMBER",
                           "allowBillableActivities": False,
+                          "cloudIntegrationManagement": False,
                           "projectAccess": "VIEW",
                           "appAccess": True}
         membership = self._org_find_members(self.user_id)
@@ -7175,6 +7190,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "MEMBER",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "projectAccess": "VIEW",
                           "appAccess": False}
 
@@ -7189,6 +7205,7 @@ class TestDXClientMembership(DXTestCase):
         exp = {"id": self.user_id,
                "level": "ADMIN",
                "allowBillableActivities": True,
+               "cloudIntegrationManagement": False,
                "projectAccess": "ADMINISTER",
                "appAccess": True}
         membership_response = self._org_find_members(self.user_id)
@@ -7199,6 +7216,7 @@ class TestDXClientMembership(DXTestCase):
                "level": "MEMBER",
                "allowBillableActivities": False,
                "projectAccess": "CONTRIBUTE",
+               "cloudIntegrationManagement": False,
                "appAccess": True}
         membership_response = self._org_find_members(self.user_id)
         self.assertEqual(membership_response, exp)
@@ -7208,6 +7226,7 @@ class TestDXClientMembership(DXTestCase):
         exp = {"id": self.user_id,
                "level": "MEMBER",
                "allowBillableActivities": True,
+               "cloudIntegrationManagement": False,
                "projectAccess": "CONTRIBUTE",
                "appAccess": True}
         membership_response = self._org_find_members(self.user_id)
@@ -7257,6 +7276,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "MEMBER",
                           "allowBillableActivities": False,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "UPLOAD"}
         membership = self._org_find_members(self.user_id)
@@ -7273,6 +7293,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)
@@ -7299,6 +7320,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "MEMBER",
                           "allowBillableActivities": False,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "UPLOAD"}
         membership = self._org_find_members(self.user_id)
@@ -7315,6 +7337,7 @@ class TestDXClientMembership(DXTestCase):
         exp_membership = {"id": self.user_id,
                           "level": "ADMIN",
                           "allowBillableActivities": True,
+                          "cloudIntegrationManagement": False,
                           "appAccess": True,
                           "projectAccess": "ADMINISTER"}
         membership = self._org_find_members(self.user_id)

dxpy-0.382.0/dxpy/toolkit_version.py

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