Skip to content
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.

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

Updates for Julia 0.7, drop 0.5 and 0.6 #292

Merged
merged 19 commits into from
Aug 11, 2018
Merged
17 changes: 13 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,26 @@ os:
- linux
- osx
julia:
- 0.6
- nightly
- 0.7
- 1.0
matrix:
allow_failures:
- julia: 1.0
notifications:
email: false
addons:
apt:
packages:
- xvfb
- xauth
- libgtk-3-dev
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.clone(pwd()); Pkg.build("Winston")'
- julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("Winston")'
- if [ `uname` = "Linux" ]; then
xvfb-run julia --check-bounds=yes -e 'Pkg.test("Winston", coverage=true)';
elif [ `uname` = "Darwin" ]; then
julia --check-bounds=yes -e 'Pkg.test("Winston", coverage=true)';
fi
after_success:
- julia -e 'cd(Pkg.dir("Winston")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';
- julia -e 'using Pkg; cd(Pkg.dir("Winston")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';
5 changes: 3 additions & 2 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
julia 0.5
julia 0.7
Cairo
Colors
IniFile 0.3.1
Gtk
Compat 0.18.0
Compat 0.60.0
Graphics 0.2.0
StatsBase 0.13.1
NaNMath 0.2.4
Reexport
9 changes: 4 additions & 5 deletions doc/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Example 1
.. winston::
:var: p

x = linspace(0, 3pi, 100)
x = range(0, stop=3pi, length=100)
c = cos.(x)
s = sin.(x)

Expand All @@ -32,7 +32,7 @@ Example 2
yrange=(0,100))

n = 21
x = linspace(0, 100, n)
x = range(0, stop=100, length=n)
yA = 40 .+ 10randn(n)
yB = x .+ 5randn(n)

Expand Down Expand Up @@ -78,7 +78,7 @@ Example 4
.. winston::
:var: p

x = linspace(0., 2pi, 40)
x = range(0., stop=2pi, length=40)
s = sin.(x)
c = cos.(x)

Expand All @@ -100,7 +100,7 @@ Example 5
.. winston::
:var: p

x = linspace(pi, 3pi, 60)
x = range(pi, stop=3pi, length=60)
c = cos.(x)
s = sin.(x)

Expand All @@ -116,4 +116,3 @@ Example 5

add(p, Curve(x, c, kind="dash"))
add(p, Curve(x, s))

5 changes: 2 additions & 3 deletions doc/fun/imagesc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ Examples
.. winston::

n = 300
x = linspace(10., -10., n)
t = linspace(-1., 1., n)
x = range(10., stop=-10., length=n)
t = range(-1., stop=1., length=n)
z = (3. .+ 4*cosh.(2x' .- 8t) .+ cosh.(4x' .- 64t)) ./
(3*cosh.(x' .- 28t) .+ cosh.(3x' .- 36t)) .^ 2

imagesc(z, (minimum(z),0.6maximum(z)))

3 changes: 1 addition & 2 deletions doc/fun/oplot.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ Example
-------

.. winston::
:preamble: srand(802)
:preamble: Random.seed!(802)

randomwalk(n) = (r = randn(n); [sum(r[1:i]) for i=1:n])
plot()
oplot(randomwalk(300))
oplot(randomwalk(300))

3 changes: 1 addition & 2 deletions doc/fun/stem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ Example

.. winston::

x = linspace(0, 5pi, 40)
x = range(0, stop=5pi, length=40)
stem(x, sin.(x), "r")

2 changes: 1 addition & 1 deletion doc/obj/PlotInset.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Example

.. winston::

x = linspace(0, 10)
x = range(0, stop=10, length=100)
p1 = plot(x, x.^2)
p2 = plot(x, sin.(x), color="red")
inset = PlotInset((0.1, 0.6), (0.7, 0.9), p2)
Expand Down
2 changes: 1 addition & 1 deletion doc/obj/PlotLabel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Example

.. winston::

x = linspace(0, 10)
x = range(0, stop=10, length=100)
p = plot(x, sin.(x))
l = PlotLabel(0.5, 0.8, "Hello World!")
add(p, l)
2 changes: 1 addition & 1 deletion doc/obj/Slope.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Example

.. winston::

x = linspace(0, 10)
x = range(0, stop=10, length=100)
p = plot(x, x + 1 ./ x, yrange=[-0.5, 10.5])
s = Slope(1, (5, 5), color="red", linekind="dashed")
add(p, s)
2 changes: 1 addition & 1 deletion doc/obj/Stems.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Example

.. winston::

x = linspace(-5, 5, 50)
x = range(-5, stop=5, length=50)
y = 1 / sqrt(2pi) * exp.(-x.^2 / 2)

s = Stems(x, y, color="blue")
Expand Down
Loading