Merge branch 'master' into mmsplicefix

kipoi · Jul 29, 2019 · 1e6b9e0 · 1e6b9e0
2 parents 10777b7 + ec8c398
commit 1e6b9e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/labranchor/dataloader.yaml b/labranchor/dataloader.yaml
@@ -15,7 +15,7 @@ args:
 defined_as: dataloader.py::BranchPointDataset
 dependencies:
   conda:
-  - python==3.6
+  - python
   pip:
   - pysam
   - numpy

diff --git a/labranchor/model.yaml b/labranchor/model.yaml
@@ -7,6 +7,8 @@ args:
   image_dim_ordering: tf
 default_dataloader: .
 dependencies:
+  conda:
+  - pip
   pip:
   - tensorflow>=1.0.0
   - keras>=2.0.4
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ args: @@
     defined_as: dataloader.py::BranchPointDataset
     dependencies:
       conda:
-      - python==3.6
+      - python
       pip:
       - pysam
       - numpy
@@ Expand Down @@