passing osx build on travis

SivyerLab · Mar 29, 2018 · 7059557 · 7059557
1 parent 6e97c8b
commit 7059557
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,6 @@ cache: pip
 branches:
   only:
     - master
-    - dev
 
 notifications:
   email:

diff --git a/pyStim/pyStim.py b/pyStim/pyStim.py
@@ -1949,8 +1949,10 @@ def make_stim(self):
             # array of coordinates for each element
             xys = []
             # populate xys
-            for y in range(self.num_check / -2, self.num_check / 2):
-                for x in range(self.num_check / -2, self.num_check / 2):
+            low, high = self.num_check // -2, self.num_check // 2
+
+            for y in range(low, high):
+                for x in range(low, high):
                     xys.append((self.check_size[0] * x,
                                 self.check_size[1] * y))
 

diff --git a/pyStim/pyStimGUI.py b/pyStim/pyStimGUI.py
@@ -1424,7 +1424,7 @@ def on_load_button(self, event):
                         line = line.rstrip()
                         if line == '#BEGIN PICKLE#':
                             next_is_pickle = True
-
+                    # TODO: fix
                     to_load = pickle.loads(to_load)
 
             except ValueError: