Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit 60acb08

Browse files
update to v0.7
1 parent f4abad1 commit 60acb08

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ os:
44
- linux
55
# - osx
66
julia:
7-
- 0.6
7+
- 0.7
88
- nightly
99
matrix:
1010
allow_failures:

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
julia 0.6
1+
julia 0.7-beta2
22
PyCall
33
DataStructures
44
Conda 0.2.0

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
3+
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
4+
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
55
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
66
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
77
matrix:

src/PyDSTool.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ __precompile__()
22

33
module PyDSTool
44

5-
using PyCall, DataStructures, DiffEqBase, RecipesBase
5+
using PyCall, DataStructures, DiffEqBase, RecipesBase, LinearAlgebra
66

77
const ds = PyNULL()
88

@@ -20,7 +20,7 @@ function __init__()
2020
# workaround it by monkey-patching `scipy.__version__` while
2121
# importing PyDSTool. We make ./_pydstool_jl_hack.py importable
2222
# and execute it by importing it.
23-
unshift!(PyVector(pyimport("sys")["path"]), @__DIR__)
23+
pushfirst!(PyVector(pyimport("sys")["path"]), @__DIR__)
2424
pyimport("_pydstool_jl_hack")
2525
else
2626
rethrow()

src/ode_construct_solve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function build_ode(name,ics,pars,vars,tdomain)
88
dsargs
99
end
1010

11-
function build_ode(f::AbstractParameterizedFunction,u0,tspan,p)
11+
function build_ode(f::DiffEqBase.AbstractParameterizedFunction,u0,tspan,p)
1212
name = string(typeof(f))
1313
pars = Dict{String,Any}(); vars = Dict{String,Any}(); ics = Dict{String,Any}()
1414
for i in 1:length(f.params)

test/runtests.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using PyDSTool
2-
using Base.Test
1+
using PyDSTool, Test
32

4-
tic()
3+
@time begin
54
@time @testset "Linear Solve" begin include("linear.jl") end
65
@time @testset "Calcium Direct" begin include("calcium.jl") end
76
@time @testset "Calcium Parameterized" begin include("pf_calcium.jl") end
8-
toc()
7+
end

0 commit comments

Comments
 (0)