dxpy 0.372.0__tar.gz → 0.373.0__tar.gz

{dxpy-0.372.0 → dxpy-0.373.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.372.0
+Version: 0.373.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.373.0/dxpy/nextflow/awscli_assets.json

@@ -0,0 +1,8 @@
+{
+  "aws:ap-southeast-2": "record-Ggjx0YQ5qP61v7Q7Qq4QQ2f7",
+  "aws:eu-central-1": "record-Ggjx2Jj4jbKyKxGXYfZgpJYy",
+  "aws:eu-west-2-g": "record-Ggjx4qBKYFQ35Gp87ybKV28Z",
+  "aws:us-east-1": "record-GgjvvP00GFJ5JjG1gX3Jbx6j",
+  "azure:westeurope": "record-Ggjx8Z8BxzQqXY9Fv4vXBqpj",
+  "azure:westus": "record-GgjxGf89ZB67Bz7f3815qk11"
+}

dxpy-0.373.0/dxpy/nextflow/awscli_assets.staging.json

@@ -0,0 +1,8 @@
+{
+  "aws:ap-southeast-2": "record-Ggjp4Fj50y9Vp27Fx8gB65fY",
+  "aws:eu-central-1": "record-Ggjp62Q4PFG1K0g562PKZgbV",
+  "aws:eu-west-2-g": "record-Ggjp7K2K60b11G4p2X4X8B98",
+  "aws:us-east-1": "record-Ggjp2p009010jB06F520vZQG",
+  "azure:westeurope": "record-GgjpB2QB7Vp4Kz8FV25Q68Jv",
+  "azure:westus": "record-GgjpJ509bvJ1p27Fx8gB65jg"
+}

{dxpy-0.372.0 → dxpy-0.373.0}/dxpy/nextflow/nextflow_utils.py

@@ -95,7 +95,7 @@ def write_dxapp(folder, content):
 
 
 def get_regional_options(region, resources_dir, profile, cache_docker, nextflow_pipeline_params):
-    nextaur_asset, nextflow_asset = get_nextflow_assets(region)
+    nextaur_asset, nextflow_asset, awscli_asset = get_nextflow_assets(region)
     regional_instance_type = get_instance_type(region)
     if cache_docker:
         image_refs = run_nextaur_collect(resources_dir, profile, nextflow_pipeline_params)
@@ -111,7 +111,8 @@ def get_regional_options(region, resources_dir, profile, cache_docker, nextflow_
             },
             "assetDepends": [
                 {"id": nextaur_asset},
-                {"id": nextflow_asset}
+                {"id": nextflow_asset},
+                {"id": awscli_asset}
             ],
             "bundledDepends": image_bundled
         }
@@ -138,15 +139,18 @@ def get_nextflow_assets(region):
     # The order of assets in the tuple is: nextaur, nextflow
     nextaur_assets = path.join(nextflow_basepath, "nextaur_assets.json")
     nextflow_assets = path.join(nextflow_basepath, "nextflow_assets.json")
+    awscli_assets = path.join(nextflow_basepath, "awscli_assets.json")
     try:
-        with open(nextaur_assets, 'r') as nextaur_f, open(nextflow_assets, 'r') as nextflow_f:
+        with open(nextaur_assets, 'r') as nextaur_f, open(nextflow_assets, 'r') as nextflow_f, open(awscli_assets, 'r') as awscli_f:
             nextaur = json.load(nextaur_f)[region]
             nextflow = json.load(nextflow_f)[region]
-        dxpy.describe(nextaur, fields={})
-        return nextaur, nextflow
+            awscli = json.load(awscli_f)[region]
+        dxpy.describe(nextaur, fields={})  # existence check
+        return nextaur, nextflow, awscli
     except ResourceNotFound:
         nextaur_assets = path.join(nextflow_basepath, "nextaur_assets.staging.json")
         nextflow_assets = path.join(nextflow_basepath, "nextflow_assets.staging.json")
+        awscli_assets = path.join(nextflow_basepath, "awscli_assets.staging.json")
 
-        with open(nextaur_assets, 'r') as nextaur_f, open(nextflow_assets, 'r') as nextflow_f:
-            return json.load(nextaur_f)[region], json.load(nextflow_f)[region]
+        with open(nextaur_assets, 'r') as nextaur_f, open(nextflow_assets, 'r') as nextflow_f, open(awscli_assets, 'r') as awscli_f:
+            return json.load(nextaur_f)[region], json.load(nextflow_f)[region], json.load(awscli_f)[region]

dxpy-0.373.0/dxpy/toolkit_version.py

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

{dxpy-0.372.0 → dxpy-0.373.0}/dxpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.372.0
+Version: 0.373.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.372.0 → dxpy-0.373.0}/dxpy.egg-info/SOURCES.txt

@@ -88,6 +88,8 @@ dxpy/dx_extract_utils/somatic_filter_payload.py
 dxpy/nextflow/ImageRef.py
 dxpy/nextflow/ImageRefFactory.py
 dxpy/nextflow/__init__.py
+dxpy/nextflow/awscli_assets.json
+dxpy/nextflow/awscli_assets.staging.json
 dxpy/nextflow/collect_images.py
 dxpy/nextflow/nextaur_assets.json
 dxpy/nextflow/nextaur_assets.staging.json

dxpy-0.372.0/dxpy/toolkit_version.py

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