From 32b94e17beb058638b23fe57b7da8bd2d47c8743 Mon Sep 17 00:00:00 2001 From: "Frey, Jedediah" Date: Fri, 3 Jan 2020 09:50:21 -0500 Subject: [PATCH] Fixed tabs in yaml and python files to only use spaces. --- .travis.yml | 8 ++++---- control/phaseplot.py | 2 +- control/tests/phaseplot_test.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 779d881ce..ddde6f906 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,9 @@ python: # # We also want to test with and without slycot env: - - SCIPY=scipy SLYCOT=conda # default, with slycot via conda - - SCIPY=scipy SLYCOT= # default, w/out slycot - - SCIPY="scipy==0.19.1" SLYCOT= # legacy support, w/out slycot + - SCIPY=scipy SLYCOT=conda # default, with slycot via conda + - SCIPY=scipy SLYCOT= # default, w/out slycot + - SCIPY="scipy==0.19.1" SLYCOT= # legacy support, w/out slycot # Add optional builds that test against latest version of slycot jobs: @@ -47,7 +47,7 @@ jobs: matrix: # Exclude combinations that are very unlikely (and don't work) exclude: - - python: "3.7" # python3.7 should use latest scipy + - python: "3.7" # python3.7 should use latest scipy env: SCIPY="scipy==0.19.1" SLYCOT= allow_failures: diff --git a/control/phaseplot.py b/control/phaseplot.py index acf39c298..c46e9839e 100644 --- a/control/phaseplot.py +++ b/control/phaseplot.py @@ -291,7 +291,7 @@ def phase_plot(odefun, X=None, Y=None, scale=1, X0=None, T=None, # set(xy, 'AutoScaleFactor', 0); if (scale < 0): - bp = mpl.plot(x1, x2, 'b.'); # add dots at base + bp = mpl.plot(x1, x2, 'b.'); # add dots at base # set(bp, 'MarkerSize', PP_arrow_markersize); return; diff --git a/control/tests/phaseplot_test.py b/control/tests/phaseplot_test.py index e1cc25a35..4f93e6d97 100644 --- a/control/tests/phaseplot_test.py +++ b/control/tests/phaseplot_test.py @@ -46,7 +46,7 @@ def testInvPendAuto(self): [[-2.3056, 2.1], [2.3056, -2.1]], T=6, verbose=False) def testOscillatorParams(self): - m = 1; b = 1; k = 1; # default values + m = 1; b = 1; k = 1; # default values phase_plot(self.oscillator_ode, timepts = [0.3, 1, 2, 3], X0 = [[-1,1], [-0.3,1], [0,1], [0.25,1], [0.5,1], [0.7,1], [1,1], [1.3,1], [1,-1], [0.3,-1], [0,-1], [-0.25,-1],