Skip to content

Fixed tabs in yaml and python files to only use spaces. #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2020
Merged

Fixed tabs in yaml and python files to only use spaces. #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion control/phaseplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion control/tests/phaseplot_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down