Cleanup

Author: Christopher Fonnesbeck

pymc/tests/test_sampling.py

@@ -17,9 +17,9 @@ def test_sample():
         test_samplers.append(psample)
 
     with model:
-        for     samplr  in test_samplers: 
-            for n       in [0, 10, 1000]:
-                yield samplr, n, step, start 
+        for samplr in test_samplers:
+            for n in [0, 10, 1000]:
+                yield samplr, n, step, start
 
 
 

pymc/tests/test_step.py

@@ -30,12 +30,4 @@ def test_step_continuous():
             np.random.seed(1)
             h = sample(8000, st, start, track_progess=False, model = model)
 
-            yield check_stat,repr(st), h, var, stat, val, bound
-
-
-
-
-<<<<<<< HEAD
-=======
-
->>>>>>> Temporarily reverting test_step
+            yield check_stat,repr(st), h, var, stat, val, bound