Skip to content

Commit 1d3cde8

Browse files
committed
Merge branch 'release-0.7.3'
2 parents 5d4b842 + 5409b73 commit 1d3cde8

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

.travis.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: julia
22
julia:
33
- 0.6
4-
- nightly
4+
- 0.7
55
notifications:
66
email: false
77
webhooks:
@@ -11,5 +11,25 @@ notifications:
1111
on_failure: always
1212
on_start: never
1313
after_success:
14-
- julia -e 'cd(Pkg.dir("ACME")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'
15-
- julia -e 'Pkg.add("Documenter", v"0.13.2", v"0.13.2+"); cd(Pkg.dir("ACME")); include(joinpath("docs", "make.jl"))'
14+
- |
15+
julia -e '
16+
if VERSION >= v"0.7.0-DEV.3656"
17+
import Pkg
18+
else
19+
cd(Pkg.dir("ACME"))
20+
end
21+
Pkg.add("Coverage")
22+
using Coverage
23+
Codecov.submit(process_folder()); Coveralls.submit(process_folder())'
24+
- |
25+
julia -e '
26+
if VERSION >= v"0.7.0-DEV.3656"
27+
using Pkg # `using Pkg` and `pkg"..."` must be in separate if blocks
28+
end
29+
@static if VERSION >= v"0.7.0-DEV.3656"
30+
pkg"add Documenter@0.13.2"
31+
else
32+
Pkg.add("Documenter", v"0.13.2", v"0.13.2+")
33+
cd(Pkg.dir("ACME"))
34+
end
35+
include(joinpath("docs", "make.jl"))'

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ACME.jl - Analog Circuit Modeling and Emulation for Julia
22

33
[![Join the chat at https://gitter.im/HSU-ANT/ACME.jl](https://badges.gitter.im/HSU-ANT/ACME.jl.svg)](https://gitter.im/HSU-ANT/ACME.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
4-
[![Documentation](https://img.shields.io/badge/docs-v0.7.2-blue.svg)](https://hsu-ant.github.io/ACME.jl/v0.7.2)
4+
[![Documentation](https://img.shields.io/badge/docs-v0.7.3-blue.svg)](https://hsu-ant.github.io/ACME.jl/v0.7.3)
55

66
ACME is a [Julia](http://julialang.org/) package for the simulation of
77
electrical circuits, focusing on audio effect circuits. It allows to
@@ -122,7 +122,7 @@ fail to run altogether.
122122

123123
## Moving on
124124

125-
There is some [documentation](https://hsu-ant.github.io/ACME.jl/v0.7.2)
125+
There is some [documentation](https://hsu-ant.github.io/ACME.jl/v0.7.3)
126126
available for how
127127
to use ACME. Additionally, you can take a look at the examples that can be found
128128
in the `examples` directory below `Pkg.dir("ACME")`.

src/circuit.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ function nonlinear_eq(c::Circuit, elem_idxs=1:length(elements(c)))
6666

6767
function offset_indexes(expr::Expr)
6868
ret = Expr(expr.head)
69-
ret.typ = expr.typ
7069
if expr.head == :ref && haskey(index_offsets, expr.args[1])
7170
push!(ret.args, expr.args[1])
7271
offsets = index_offsets[expr.args[1]]

0 commit comments

Comments
 (0)