Skip to content

Commit 53d340b

Browse files
Jedmurrayrm
Jed
authored andcommitted
Fixed tabs in yaml and python files to only use spaces. (#362)
1 parent ccbd7ac commit 53d340b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ python:
2424
#
2525
# We also want to test with and without slycot
2626
env:
27-
- SCIPY=scipy SLYCOT=conda # default, with slycot via conda
28-
- SCIPY=scipy SLYCOT= # default, w/out slycot
29-
- SCIPY="scipy==0.19.1" SLYCOT= # legacy support, w/out slycot
27+
- SCIPY=scipy SLYCOT=conda # default, with slycot via conda
28+
- SCIPY=scipy SLYCOT= # default, w/out slycot
29+
- SCIPY="scipy==0.19.1" SLYCOT= # legacy support, w/out slycot
3030

3131
# Add optional builds that test against latest version of slycot
3232
jobs:
@@ -47,7 +47,7 @@ jobs:
4747
matrix:
4848
# Exclude combinations that are very unlikely (and don't work)
4949
exclude:
50-
- python: "3.7" # python3.7 should use latest scipy
50+
- python: "3.7" # python3.7 should use latest scipy
5151
env: SCIPY="scipy==0.19.1" SLYCOT=
5252

5353
allow_failures:

control/phaseplot.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def phase_plot(odefun, X=None, Y=None, scale=1, X0=None, T=None,
291291
# set(xy, 'AutoScaleFactor', 0);
292292

293293
if (scale < 0):
294-
bp = mpl.plot(x1, x2, 'b.'); # add dots at base
294+
bp = mpl.plot(x1, x2, 'b.'); # add dots at base
295295
# set(bp, 'MarkerSize', PP_arrow_markersize);
296296

297297
return;

control/tests/phaseplot_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def testInvPendAuto(self):
4646
[[-2.3056, 2.1], [2.3056, -2.1]], T=6, verbose=False)
4747

4848
def testOscillatorParams(self):
49-
m = 1; b = 1; k = 1; # default values
49+
m = 1; b = 1; k = 1; # default values
5050
phase_plot(self.oscillator_ode, timepts = [0.3, 1, 2, 3], X0 =
5151
[[-1,1], [-0.3,1], [0,1], [0.25,1], [0.5,1], [0.7,1],
5252
[1,1], [1.3,1], [1,-1], [0.3,-1], [0,-1], [-0.25,-1],

0 commit comments

Comments
 (0)