Merge branch 'master' into master

.github/workflows/TagBot.yml

@@ -0,0 +1,11 @@
+name: TagBot
+on:
+  schedule:
+    - cron: 0 * * * *
+jobs:
+  TagBot:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: JuliaRegistries/TagBot@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -1,15 +1,39 @@
 language: julia
 julia:
   - 1.0
-  - 1.5
+  - 1
   - nightly
 matrix:
   allow_failures:
   - julia: nightly
   fast_finish: true
 notifications:
     email: false
+branches:
+  only: 
+    - master
+addons:
+  apt:
+    packages:
+      - libgtk-3-dev
+      - xvfb
+      - dvipng
+      - texlive
+cache:
+  directories:
+  # This should speed up builds
+  - $HOME/.julia/artifacts
+
+env:
+  - PLOTS_TEST="true" GKSwstype="100"
+
+script:
+  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+  # Needed for plotting on travis
+  - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
+  - $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
+
 after_success:
-    - julia -e 'using Pkg; import ControlSystems; cd(joinpath(dirname(pathof(ControlSystems)), "..")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-    - julia -e 'using Pkg; Pkg.add("Documenter"); Pkg.add("GR"); Pkg.add("Plots"); Pkg.add("DSP")'
-    - julia -e 'using Pkg; import ControlSystems; cd(joinpath(dirname(pathof(ControlSystems)), "..")); include(joinpath("docs", "make.jl"))'
+    - julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+    - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
+    - $TESTCMD --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate();import ControlSystems; cd(joinpath(dirname(pathof(ControlSystems)), "..")); include(joinpath("docs", "make.jl"))'

Project.toml

@@ -2,7 +2,7 @@ name = "ControlSystems"
 uuid = "a6e380b2-a6ca-5380-bf3e-84a91bcd477e"
 authors = ["Dept. Automatic Control, Lund University"]
 repo = "https://github.com/JuliaControl/ControlSystems.jl.git"
-version = "0.7.0"
+version = "0.8.0"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -18,7 +18,6 @@ Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 Colors = "0.9.2, 0.10, 0.11, 0.12"
@@ -31,3 +30,12 @@ OrdinaryDiffEq = "5.2"
 Plots = "0.24, 0.25, 0.26, 0.27, 0.28, 0.29, 1.0"
 Polynomials = "1.0"
 julia = "1.0"
+
+[extras]
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+
+[targets]
+test = ["Test", "Documenter", "GR", "StaticArrays"]

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.com/JuliaControl/ControlSystems.jl.svg?branch=master)](https://travis-ci.com/JuliaControl/ControlSystems.jl)
 [![PkgEval](https://juliaci.github.io/NanosoldierReports/pkgeval_badges/C/ControlSystems.svg)](https://juliaci.github.io/NanosoldierReports/pkgeval_badges/report.html)
-[![Gitter](https://badges.gitter.im/JuliaControl/ControlSystems.jl.svg)](https://gitter.im/JuliaControl/ControlSystems.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![codecov](https://codecov.io/gh/JuliaControl/ControlSystems.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaControl/ControlSystems.jl)
 
 [![](https://img.shields.io/badge/docs-stable-blue.svg)](https://juliacontrol.github.io/ControlSystems.jl/stable)
 [![](https://img.shields.io/badge/docs-latest-blue.svg)](https://juliacontrol.github.io/ControlSystems.jl/latest)
@@ -14,11 +14,15 @@ A control systems design toolbox for Julia.
 To install, in the Julia REPL:
 
 ```julia
-Pkg.add("ControlSystems")
+using Pkg; Pkg.add("ControlSystems")
 ```
 
 ## News
 
+### 2020-10
+- `lsimplot, stepplot, impulseplot` now have the same signatures as the corresponding non-plotting function.
+- New function `d2c` for conversion from discrete to continuous.
+
 ### 2020-09-24
 Release v0.7 introduces a new `TimeEvolution` type to handle `Discrete/Continuous` systems. See the [release notes](https://github.com/JuliaControl/ControlSystems.jl/releases/tag/v0.7.0).
 
@@ -109,7 +113,7 @@ CLs = TransferFunction[kp*P/(1 + kp*P) for kp = [1, 5, 15]];
 
 # Plot the step response of the controllers
 # Any keyword arguments supported in Plots.jl can be supplied
-stepplot(CLs, label=["Kp = 1", "Kp = 5", "Kp = 15"])
+stepplot(CLs, label=["Kp = 1" "Kp = 5" "Kp = 15"])
 ```
 
 ![StepResponse](/example/step_response.png)

docs/Project.toml

@@ -0,0 +1,8 @@
+[deps]
+ControlSystems = "a6e380b2-a6ca-5380-bf3e-84a91bcd477e"
+DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

docs/make.jl

@@ -1,20 +1,44 @@
+# Set plot globals
+ENV["PLOTS_TEST"] = "true"
+ENV["GKSwstype"] = "100"
+
 using Documenter, ControlSystems, Plots, LinearAlgebra, DSP
 import GR # Bug with world age in Plots.jl, see https://github.com/JuliaPlots/Plots.jl/issues/1047
+gr()
+default(show=false, size=(800,450))
+
+dir = joinpath(dirname(pathof(ControlSystems)), "..")
+cd(dir)
 
-include("src/makeplots.jl")
+# Copied from Documenter/src/Document.jl, modified to remove # hide lines
+Markdown = Documenter.Documents.Markdown
+function Documenter.Documents.doctest_replace!(block::Markdown.Code)
+    startswith(block.language, "jldoctest") || return false
+    # suppress output for `#output`-style doctests with `output=false` kwarg
+    if occursin(r"^# output$"m, block.code) && occursin(r";.*output\h*=\h*false", block.language)
+        input = first(split(block.code, "# output\n", limit = 2))
+        block.code = rstrip(input)
+    end
+    # Remove # hide lines
+    block.code = Documenter.Expanders.droplines(block.code)
+    # correct the language field
+    block.language = occursin(r"^julia> "m, block.code) ? "julia-repl" : "julia"
+    return false
+end
 
+println("Making docs")
 makedocs(modules=[ControlSystems],
     format=Documenter.HTML(),
     sitename="ControlSystems.jl",
     pages=[
         "Home" => "index.md",
-        "Examples" => Any[
-            "Design" => "examples/example.md",
-        ],
         "Guide" => Any[
             "Introduction" => "man/introduction.md",
             "Creating Systems" => "man/creating_systems.md",
         ],
+        "Examples" => Any[
+            "Design" => "examples/example.md",
+        ],
         "Functions" => Any[
             "Constructors" => "lib/constructors.md",
             "Analysis" => "lib/analysis.md",
@@ -24,21 +48,5 @@ makedocs(modules=[ControlSystems],
         ],
     ]
     )
-# If not running travis, generate the plots here, even if we are not deploying
-if get(ENV, "TRAVIS", "") == ""
-    makePlots()
-end
-
-# Only build plots in travis if we are deploying
-# And dont install the dependencies unless we are deploying
-function myDeps()
-    if get(ENV, "TRAVIS", "") != ""
-        println("Installing deploy dependencies")
-        makePlots()
-    end
-end
 
-deploydocs(
-    repo = "github.com/JuliaControl/ControlSystems.jl.git",
-    deps = myDeps
-)
+deploydocs(repo = "github.com/JuliaControl/ControlSystems.jl.git")