Skip to content

Commit f528aeb

Browse files
martinholtersmartinholters
committed
Merge branch 'develop'
And bump version to 0.9.3.
2 parents 178da77 + 3832cca commit f528aeb

File tree

13 files changed

+242
-63
lines changed

13 files changed

+242
-63
lines changed

‎.github/workflows/Documentation.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
tags: '*'
8+
pull_request:
9+
10+
jobs:
11+
build:
12+
name: build on Julia ${{ matrix.julia-version }}
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
julia-version: ['1.0', '1.1', '1.2', '1.3', 'nightly']
17+
steps:
18+
- uses: actions/checkout@v2
19+
- uses: julia-actions/setup-julia@v1
20+
with:
21+
version: ${{ matrix.julia-version }}
22+
- name: Install dependencies
23+
run: julia --project=docs -e 'using Pkg; Pkg.instantiate()'
24+
- name: Build and deploy
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
27+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
28+
run: julia --project=docs/ docs/make.jl
29+
- uses: actions/upload-artifact@v1
30+
with:
31+
name: docs
32+
path: docs/build

‎.github/workflows/TagBot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: TagBot
2+
on:
3+
schedule:
4+
- cron: 0 * * * *
5+
jobs:
6+
TagBot:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: JuliaRegistries/TagBot@v1
10+
with:
11+
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- master
8+
tags: '*'
9+
pull_request:
10+
11+
jobs:
12+
test:
13+
name: Test on Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - ${{ matrix.julia-arch }}
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
matrix:
17+
julia-version: ['1.0', '1.1', '1.2', '1.3', 'nightly']
18+
julia-arch: [x64, x86]
19+
os: [ubuntu-latest, windows-latest, macOS-latest]
20+
exclude:
21+
- os: macOS-latest
22+
julia-arch: x86
23+
steps:
24+
- uses: actions/checkout@v1.0.0
25+
- uses: julia-actions/setup-julia@v1.0.1
26+
with:
27+
version: ${{ matrix.julia-version }}
28+
arch: ${{ matrix.julia-arch }}
29+
- uses: julia-actions/julia-runtest@v0.1.0
30+
- uses: julia-actions/julia-uploadcodecov@v0.1.0
31+
env:
32+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
33+
- uses: julia-actions/julia-uploadcoveralls@v0.1.0
34+
env:
35+
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

‎.github/workflows/compathelper.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: CompatHelper
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
7+
jobs:
8+
CompatHelper:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: julia-actions/setup-julia@v1
12+
with:
13+
version: 1.3
14+
- name: Pkg.add("CompatHelper")
15+
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
16+
- name: CompatHelper.main()
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
run: julia -e 'using CompatHelper; CompatHelper.main()'

‎.travis.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,3 @@ notifications:
1515
on_start: never
1616
codecov: true
1717
coveralls: true
18-
jobs:
19-
include:
20-
- &docs
21-
stage: "Documentation"
22-
julia: 1.0
23-
script:
24-
- julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd()))'
25-
- julia --project=docs/ docs/make.jl
26-
- <<: *docs
27-
julia: 1.1
28-
- <<: *docs
29-
julia: 1.2
30-
- <<: *docs
31-
julia: 1.3
32-
- <<: *docs
33-
julia: nightly

‎Project.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name = "ACME"
22
uuid = "ca8b7239-ccd3-5cce-807f-2072f3f0d108"
3-
version = "0.9.2"
3+
version = "0.9.3"
44

55
[deps]
6+
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
67
IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
78
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
89
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
@@ -13,6 +14,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1314
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1415

1516
[compat]
17+
Compat = "3.7"
1618
IterTools = "1"
1719
OrderedCollections = "1"
1820
ProgressMeter = "0.6, 0.7, 0.8, 0.9, 1"

‎README.md‎

Lines changed: 4 additions & 4 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.9.2-blue.svg)](https://hsu-ant.github.io/ACME.jl/v0.9.2/)
4+
[![Documentation](https://img.shields.io/badge/docs-v0.9.3-blue.svg)](https://hsu-ant.github.io/ACME.jl/v0.9.3/)
55
[![DOI](https://zenodo.org/badge/48224425.svg)](https://zenodo.org/badge/latestdoi/48224425)
66

77
ACME is a [Julia](http://julialang.org/) package for the simulation of
@@ -18,7 +18,7 @@ Schematics"](http://www.eurasip.org/Proceedings/Eusipco/Eusipco2015/papers/15701
1818
## Installation
1919

2020
If you have not done so already, [download and install
21-
Julia](http://julialang.org/downloads/). (Any version starting with 0.6 should
21+
Julia](http://julialang.org/downloads/). (Any version starting with 1.0 should
2222
be fine; earlier ACME versions support Julia starting with version 0.3.)
2323

2424
To install ACME, start Julia and run:
@@ -104,7 +104,7 @@ row per input (just one in the example) and one column per sample. So for a
104104
sinusoid at 1 kHz lasting one second, we do
105105

106106
```Julia
107-
y = run!(model, sin(2π*1000/44100*(0:44099).'))
107+
y = run!(model, [sin(2π*1000/44100*n) for c in 1:1, n in 0:44099])
108108
```
109109

110110
The output `y` now likewise is a matrix with one row for the one probe we have
@@ -123,7 +123,7 @@ fail to run altogether.
123123

124124
## Moving on
125125

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

‎docs/Manifest.toml‎

Lines changed: 58 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,50 @@
1+
[[ACME]]
2+
deps = ["Compat", "IterTools", "LinearAlgebra", "Markdown", "OrderedCollections", "ProgressMeter", "SparseArrays", "StaticArrays", "Statistics"]
3+
path = ".."
4+
uuid = "ca8b7239-ccd3-5cce-807f-2072f3f0d108"
5+
16
[[Base64]]
27
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
38

9+
[[Compat]]
10+
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
11+
git-tree-sha1 = "2e23d71ad695ec28ca58ddd44869f07afa33cc76"
12+
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
13+
version = "3.7.0"
14+
415
[[Dates]]
516
deps = ["Printf"]
617
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
718

19+
[[DelimitedFiles]]
20+
deps = ["Mmap"]
21+
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
22+
823
[[Distributed]]
924
deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"]
1025
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
1126

1227
[[DocStringExtensions]]
13-
git-tree-sha1 = "0513f1a8991e9d83255e0140aace0d0fc4486600"
28+
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
29+
git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a"
1430
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
15-
version = "0.8.0"
16-
17-
[DocStringExtensions.deps]
18-
LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
19-
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
20-
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
21-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
31+
version = "0.8.1"
2232

2333
[[Documenter]]
24-
deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
25-
git-tree-sha1 = "1b6ae3796f60311e39cd1770566140d2c056e87f"
34+
deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
35+
git-tree-sha1 = "885467cebde4639a3d81953652cc53ff5a73cb87"
2636
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
27-
version = "0.23.3"
37+
version = "0.24.3"
2838

2939
[[InteractiveUtils]]
3040
deps = ["LinearAlgebra", "Markdown"]
3141
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
3242

43+
[[IterTools]]
44+
git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18"
45+
uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
46+
version = "1.3.0"
47+
3348
[[JSON]]
3449
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
3550
git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e"
@@ -56,11 +71,17 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
5671
[[Mmap]]
5772
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
5873

74+
[[OrderedCollections]]
75+
deps = ["Random", "Serialization", "Test"]
76+
git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
77+
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
78+
version = "1.1.0"
79+
5980
[[Parsers]]
6081
deps = ["Dates", "Test"]
61-
git-tree-sha1 = "ef0af6c8601db18c282d092ccbd2f01f3f0cd70b"
82+
git-tree-sha1 = "0139ba59ce9bc680e2925aec5b7db79065d60556"
6283
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
63-
version = "0.3.7"
84+
version = "0.3.10"
6485

6586
[[Pkg]]
6687
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
@@ -70,6 +91,12 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
7091
deps = ["Unicode"]
7192
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
7293

94+
[[ProgressMeter]]
95+
deps = ["Distributed", "Printf"]
96+
git-tree-sha1 = "ea1f4fa0ff5e8b771bf130d87af5b7ef400760bd"
97+
uuid = "92933f4c-e287-5a05-a399-4b506db050ca"
98+
version = "1.2.0"
99+
73100
[[REPL]]
74101
deps = ["InteractiveUtils", "Markdown", "Sockets"]
75102
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
@@ -84,9 +111,27 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
84111
[[Serialization]]
85112
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
86113

114+
[[SharedArrays]]
115+
deps = ["Distributed", "Mmap", "Random", "Serialization"]
116+
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
117+
87118
[[Sockets]]
88119
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
89120

121+
[[SparseArrays]]
122+
deps = ["LinearAlgebra", "Random"]
123+
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
124+
125+
[[StaticArrays]]
126+
deps = ["LinearAlgebra", "Random", "Statistics"]
127+
git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c"
128+
uuid = "90137ffa-7385-5640-81b9-e52037218182"
129+
version = "0.12.1"
130+
131+
[[Statistics]]
132+
deps = ["LinearAlgebra", "SparseArrays"]
133+
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
134+
90135
[[Test]]
91136
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
92137
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

‎docs/Project.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
2+
ACME = "ca8b7239-ccd3-5cce-807f-2072f3f0d108"
23
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
34

45
[compat]
5-
Documenter = "=0.23.3"
6+
Documenter = "=0.24.3"

‎docs/src/gettingstarted.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Installation
44

55
If you have not done so already, [download and install
6-
Julia](http://julialang.org/downloads/). (Any version starting with 0.6 should
6+
Julia](http://julialang.org/downloads/). (Any version starting with 1.0 should
77
be fine; earlier ACME versions also support Julia 0.3 and later.)
88

99
To install ACME, start Julia and run:

0 commit comments

Comments
 (0)