Skip to content

Commit 6775851

Browse files
authored
Merge branch 'master' into compathelper/new_version/2021-04-01-02-09-45-410-3181137667
2 parents 83f06c2 + c7d40cc commit 6775851

File tree

8 files changed

+5
-184
lines changed

8 files changed

+5
-184
lines changed

.github/workflows/CompatHelper.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
julia-version: [1.2.0]
14+
julia-version: [1]
1515
julia-arch: [x86]
1616
os: [ubuntu-latest]
1717
steps:

Project.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ version = "2.3.0"
66
[deps]
77
EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"
88
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
9-
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
109
MathML = "abcecc63-2b08-419c-80c4-c63dca6fa478"
1110
Memoize = "c03570c3-d221-55d1-a50c-7939bbd78826"
1211
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
1312
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
1413
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
1514
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
16-
URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
1715

1816
[compat]
1917
EzXML = "1.1"
20-
JSON3 = "1.8"
18+
HTTP = "0.9"
2119
MathML = "0.1.5"
2220
Memoize = "0.4"
23-
ModelingToolkit = "5.13"
21+
ModelingToolkit = "5.14"
2422
OrdinaryDiffEq = "5.52"
2523
SymbolicUtils = "0.9.3"
2624
julia = "1.5"

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ CellMLToolkit.jl is a Julia library that connects [CellML](http://cellml.org) mo
1515
To install, run
1616

1717
```julia
18-
Pkg.add("https://github.com/SciML/CellMLToolkit.jl")
18+
] add CellMLToolkit
1919
```
2020

2121
## Simple Example
2222

2323
```Julia
24-
using CellMLToolkit, DifferentialEquations, Plots
24+
using CellMLToolkit, OrdinaryDiffEq, Plots
2525

2626
prob = read_cellml("models/lorenz.cellml.xml", (0,100.0))
2727
sol = solve(prob)

src/CellMLToolkit.jl

-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ using ModelingToolkit
77
using EzXML
88
using Memoize
99

10-
include("utils.jl")
11-
export curl_exposures
12-
13-
# include("cellml.jl")
1410
include("accessors.jl")
1511
include("components.jl")
1612
include("import.jl")

src/utils.jl

-23
This file was deleted.

test/repos.jl

-77
This file was deleted.

test/runtests.jl

-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
using Test
22
using CellMLToolkit
33
using OrdinaryDiffEq
4-
using JSON3, Base.Threads
54
using ModelingToolkit
65

76
@testset "CellMLToolkit.jl" begin
87
@testset "beeler.jl" begin include("beeler.jl") end
9-
10-
# mainly a used as a bin/ don't want to test every PR
11-
# @testset "physiome.jl" begin include("test_physiome.jl") end
128
end

test/test_physiome.jl

-69
This file was deleted.

0 commit comments

Comments
 (0)