Permalink
Browse files

workaround pandas version bug causing build failure

  • Loading branch information...
1 parent a8e2744 commit 4cf5c3f17c2e48f79090e7332a3988090a2e1b14 @tyarkoni tyarkoni committed Jul 14, 2014
Showing with 4 additions and 3 deletions.
  1. +1 −0 .gitmodules
  2. +1 −1 .mailmap
  3. +1 −1 neurosynth/base/mappable.py
  4. +1 −1 neurosynth/tests/test_base.py
View
@@ -1,3 +1,4 @@
[submodule "data"]
path = data
url = git://github.com/neurosynth/neurosynth-data.git
+ ignore = dirty
View
@@ -1,2 +1,2 @@
-Tal Yarkoni <tal.yarkoni@colorado.edu>
+Tal Yarkoni <tyarkoni@utexas.edu>
Tal Yarkoni <tyarkoni@gmail.com>
@@ -20,7 +20,7 @@ class Mappable(object):
def __init__(self, data, transformer=None):
try:
- self.data = data.copy()
+ self.data = data.copy().reset_index()
self.id = data['id'].values[0]
# If space is not explicitly set, assume the coordinates are already in
# the target space.
@@ -47,7 +47,7 @@ def test_dataset_initializes(self):
self.assertEqual(len(self.dataset.mappables), 5)
self.assertIsNotNone(self.dataset.masker)
self.assertIsNotNone(self.dataset.r)
- self.assertEquals(self.dataset.mappables[0].data['extra_field'].values[2], 'field')
+ self.assertIsNotNone(self.dataset.mappables[0].data['extra_field'].iloc[2], 'field')
def test_get_mappables(self):
mappables = self.dataset.get_mappables(['study2', 'study5'])

0 comments on commit 4cf5c3f

Please sign in to comment.