diff --git a/.travis.yml b/.travis.yml index 232abf67..71c7eadf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ notifications: # uncomment the following lines to override the default test script #script: # - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi -# - julia -e 'Pkg.clone(pwd()); Pkg.build("Plot"); Pkg.test("Plot"; coverage=true)' +# - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots"); Pkg.test("Plots"; coverage=true)' diff --git a/LICENSE.md b/LICENSE.md index f8bddebe..7e83c406 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -The Plot.jl package is licensed under the MIT "Expat" License: +The Plots.jl package is licensed under the MIT "Expat" License: > Copyright (c) 2015: Thomas Breloff. > diff --git a/README.md b/README.md index 658ce34b..c905cbeb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Plot +# Plots -[![Build Status](https://travis-ci.org/tbreloff/Plot.jl.svg?branch=master)](https://travis-ci.org/tbreloff/Plot.jl) +[![Build Status](https://travis-ci.org/tbreloff/Plots.jl.svg?branch=master)](https://travis-ci.org/tbreloff/Plots.jl) Plotting interface and wrapper for several plotting packages. @@ -9,7 +9,7 @@ Plotting interface and wrapper for several plotting packages. First, clone the package, and get any plotting packages you need: ``` -Pkg.clone("https://github.com/JuliaPlot/Plot.jl.git") +Pkg.clone("https://github.com/JuliaPlot/Plots.jl.git") Pkg.clone("https://github.com/tbreloff/Qwt.jl.git") # requires pyqt and pyqwt Pkg.add("Gadfly") # might also need to Pkg.checkout("Gadfly") and maybe Colors/Compose... I had trouble with it ``` @@ -17,7 +17,7 @@ Pkg.add("Gadfly") # might also need to Pkg.checkout("Gadfly") and maybe Colors/ Now load it in: ``` -using Plot +using Plots ``` Do a plot in Qwt, then save a png: @@ -25,7 +25,7 @@ Do a plot in Qwt, then save a png: ``` plotter(:Qwt) plot(1:10) -savepng(ans, Plot.IMG_DIR * "qwt1.png") +savepng(ans, Plots.IMG_DIR * "qwt1.png") ``` which saves: @@ -38,7 +38,7 @@ Do a plot in Gadfly, then save a png: ``` plotter(:Gadfly) plot(1:10) -savepng(ans, Plot.IMG_DIR * "gadfly1.png", 6Gadfly.inch, 4Gadfly.inch) +savepng(ans, Plots.IMG_DIR * "gadfly1.png", 6Gadfly.inch, 4Gadfly.inch) ``` which saves: @@ -48,15 +48,15 @@ which saves: Note that you do not need all underlying packages to use this. I use Requires.jl to perform lazy loading of the modules, so there's no initialization until you call `plotter()`. -This has an added benefit that you can call `using Plot` and it should return quickly... +This has an added benefit that you can call `using Plots` and it should return quickly... no more waiting for a plotting package to load when you don't even use it. :) ``` -julia> tic(); using Plot; toc(); +julia> tic(); using Plots; toc(); elapsed time: 0.356158445 seconds julia> tic(); using Gadfly; toc(); -WARNING: using Gadfly.Plot in module Main conflicts with an existing identifier. +WARNING: using Gadfly.Plots in module Main conflicts with an existing identifier. elapsed time: 3.1334697 seconds ``` diff --git a/appveyor.yml b/appveyor.yml index 92169b42..c76374ba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,7 @@ build_script: # Need to convert from shallow to complete for Pkg.clone to work - IF EXIST .git\shallow (git fetch --unshallow) - C:\projects\julia\bin\julia -e "versioninfo(); - Pkg.clone(pwd(), \"Plot\"); Pkg.build(\"Plot\")" + Pkg.clone(pwd(), \"Plots\"); Pkg.build(\"Plots\")" test_script: - - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"Plot\")" + - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"Plots\")" diff --git a/src/Plot.jl b/src/Plots.jl similarity index 99% rename from src/Plot.jl rename to src/Plots.jl index a03a34d3..40497c06 100644 --- a/src/Plot.jl +++ b/src/Plots.jl @@ -1,4 +1,4 @@ -module Plot +module Plots using Requires @@ -76,7 +76,7 @@ currentPlot!(plot) = (CURRENT_PLOT.nullableplot = Nullable(plot)) # --------------------------------------------------------- -const IMG_DIR = "$(ENV["HOME"])/.julia/v0.4/Plot/img/" +const IMG_DIR = "$(ENV["HOME"])/.julia/v0.4/Plots/img/" # --------------------------------------------------------- diff --git a/test/runtests.jl b/test/runtests.jl index 681a2301..e3b2bdd5 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,4 +1,4 @@ -using Plot +using Plots using Base.Test # write your own tests here