From b23e60f6be6bf46890078a81dc0454b3af53ce9e Mon Sep 17 00:00:00 2001 From: M Bernt Date: Mon, 9 Nov 2020 16:55:35 +0100 Subject: [PATCH] [ci skip] Merge PR 25235 Merge PR #25235, commits were: * intervene: fix pandas version <1.0 in 1.0 DataFrame.ix was deprecated which leads to: ``` File "/usr/local/lib/python3.8/site-packages/intervene/modules/pairwise/pairwise.py", line 214, in heatmap_triangle D = D.ix[cluster_order, cluster_order] File "/usr/local/lib/python3.8/site-packages/pandas/core/generic.py", line 5139, in __getattr__ return object.__getattribute__(self, name) ``` --- recipes/intervene/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/intervene/meta.yaml b/recipes/intervene/meta.yaml index 652c0fa2478a4..d83a40619f09f 100644 --- a/recipes/intervene/meta.yaml +++ b/recipes/intervene/meta.yaml @@ -8,7 +8,7 @@ source: build: noarch: python - number: 4 + number: 5 rpaths: - lib/R/lib/ - lib/ @@ -22,7 +22,7 @@ requirements: - bedtools >=2.29.1 - pybedtools - matplotlib-base - - pandas + - pandas <1.0.0 - numpy - scipy - seaborn