fixed for pandas v1.0.0 #37 #40

asntech · Oct 12, 2020 · c447413 · c447413
1 parent eede7a3
commit c447413
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/intervene/__init__.py b/intervene/__init__.py
@@ -1 +1 @@
-__version__ = '0.6.4'
+__version__ = '0.6.5'
diff --git a/intervene/modules/pairwise/pairwise.py b/intervene/modules/pairwise/pairwise.py
@@ -147,7 +147,8 @@ def barplot(series, matrix, outfile, options, max_size=1):
     ax.set_axisbelow(True)
 
     # Order the bars by the clustering.
-    series = series.ix[order]
+    #series = series.ix[order]
+    series = series.loc[order] #pandas v1.0
 
     namelen = 15
     # Shorten lengthy names.
@@ -211,7 +212,9 @@ def heatmap_triangle(dataframe, axes, options):
     Z = sch.linkage(D, method='average')
     R = sch.dendrogram(Z, no_plot=True)
     cluster_order = R['leaves']
-    D = D.ix[cluster_order, cluster_order]
+
+    #D = D.ix[cluster_order, cluster_order]
+    D = D.iloc[cluster_order, cluster_order] #pandas v1.0
 
     # Get the lower triangle of the matrix. 
     #C = np.tril(D)

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-pandas
+pybedtools
+pandas >= 1.0.0
 numpy
 scipy
-pybedtools
 matplotlib
 seaborn