Merge pull request #44 from JuliaControl/fastdocs

Fastdocs

Author: mfalt

.travis.yml

@@ -10,5 +10,4 @@ script:
 after_success:
     - julia -e 'cd(Pkg.dir("ControlSystems")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
     - julia -e 'Pkg.clone("https://github.com/MichaelHatherly/Lapidary.jl")'
-    - julia -e 'ENV["PYTHON"]=""; Pkg.add("PyPlot"); Pkg.build("PyCall")'
     - julia -e 'cd(Pkg.dir("ControlSystems")); include(joinpath("docs", "make.jl"))'

docs/make.jl

@@ -1,11 +1,29 @@
 using Lapidary, ControlSystems, Plots
+include("src/makeplots.jl")
 
 makedocs(modules=[ControlSystems])
 
-include("src/makeplots.jl")
+# 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")
+        run(`pip install --user pygments mkdocs`)
+        ENV["PYTHON"]=""
+        Pkg.add("PyPlot")
+        Pkg.build("PyCall")
+        makePlots()
+    end
+end
 
 deploydocs(
     repo = "github.com/JuliaControl/ControlSystems.jl.git",
     latest = "master",
-    julia = "0.4"
+    julia = "0.4",
+    deps = myDeps
 )

docs/src/makeplots.jl

@@ -1,3 +1,7 @@
+function makePlots()
+
+println("Generating plots")
+
 plotsDir = (pwd()[end-3:end] == "docs") ? "build/plots" : "docs/build/plots"
 mkdir(plotsDir)
 Plots.pyplot()
@@ -10,15 +14,15 @@ Plots.savefig(plotsDir*"/pidgofplot.svg")
 
 ωp = 0.8
 kp,ki,C = loopshapingPI(P,ωp,phasemargin=60, doplot=false)
-gangoffourplot(P,C)
+gangoffourplot(P, [tf(1), C])
 Plots.savefig(plotsDir*"/pidgofplot2.svg")
 nyquistplot([P, P*C])
 Plots.savefig(plotsDir*"/pidnyquistplot.svg")
 
 
 ωp = 2
 kp,ki,C60 = loopshapingPI(P,ωp,rl=1,phasemargin=60, doplot=true)
-gangoffourplot(P,C60)
+gangoffourplot(P, [tf(1), C60])
 Plots.savefig(plotsDir*"/pidgofplot3.svg")
 nyquistplot([P, P*C60])
 Plots.savefig(plotsDir*"/pidnyquistplot2.svg")
@@ -88,3 +92,4 @@ Plots.savefig(plotsDir*"/pidplotsgof2.svg")
 #f2 = gangoffourplot(P, tf(-S,R))
 #Plots.savefig(f1, "$plotsDir/rstcstepplot.svg")
 #Plots.savefig(f2, "$plotsDir/rstcgofplot.svg")
+end