Merge branch 'master' into dev

KrishnaswamyLab · Jun 8, 2018 · 0a0acc4 · 0a0acc4
2 parents 25f5953 + decb351
commit 0a0acc4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Python/phate/io.py b/Python/phate/io.py
@@ -82,10 +82,10 @@ def load_10X(data_dir, sparse=True, gene_labels='symbol'):
         columns = pd.Index(genes[gene_labels])
         if sparse and np.sum(columns.duplicated()) > 0:
             warnings.warn(
-                "Duplicate gene names detected! Forcing `gene_labels='both'`."
+                "Duplicate gene names detected! Forcing `gene_labels='id'`."
                 "Alternatively, try loading the matrix with "
                 "`sparse=False`", RuntimeWarning)
-            columns = _combine_gene_id(genes)
+            columns = genes['id']
 
     if sparse:
         data = pd.SparseDataFrame(m.T, index=index,