Skip to content

Commit fba3324

Browse files
authored
Merge branch 'main' into bgc/sign_convention
2 parents 92f354b + e6ffefa commit fba3324

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1298
-1091
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ updates:
77
interval: "weekly"
88
ignore:
99
- dependency-name: "crate-ci/typos"
10-
update-types: ["version-update:semver-patch"]
10+
update-types: ["version-update:semver-patch", "version-update:semver-minor"]

.github/workflows/CI.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- '1'
2222
steps:
2323
- uses: actions/checkout@v4
24-
- uses: julia-actions/setup-julia@v1
24+
- uses: julia-actions/setup-julia@v2
2525
with:
2626
version: ${{ matrix.version }}
27-
- uses: actions/cache@v3
27+
- uses: actions/cache@v4
2828
env:
2929
cache-name: cache-artifacts
3030
with:
@@ -37,6 +37,8 @@ jobs:
3737
- uses: julia-actions/julia-buildpkg@v1
3838
- uses: julia-actions/julia-runtest@v1
3939
- uses: julia-actions/julia-processcoverage@v1
40-
- uses: codecov/codecov-action@v3
40+
- uses: codecov/codecov-action@v4
4141
with:
4242
file: lcov.info
43+
token: ${{ secrets.CODECOV_TOKEN }}
44+
fail_ci_if_error: true

.github/workflows/Documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
2424
run: julia --project=docs/ --code-coverage=user docs/make.jl
2525
- uses: julia-actions/julia-processcoverage@v1
26-
- uses: codecov/codecov-action@v3
26+
- uses: codecov/codecov-action@v4
2727
with:
2828
file: lcov.info

.github/workflows/Downgrade.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
version: ['1']
1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: julia-actions/setup-julia@v1
21+
- uses: julia-actions/setup-julia@v2
2222
with:
2323
version: ${{ matrix.version }}
24-
- uses: cjdoris/julia-downgrade-compat-action@v1
24+
- uses: julia-actions/julia-downgrade-compat@v1
2525
# if: ${{ matrix.version == '1.6' }}
2626
with:
2727
skip: Pkg,TOML
2828
- uses: julia-actions/julia-buildpkg@v1
29-
- uses: julia-actions/julia-runtest@v1
29+
- uses: julia-actions/julia-runtest@v1

.github/workflows/Downstream.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- {user: SciML, repo: ModelingToolkit.jl}
2121
steps:
2222
- uses: actions/checkout@v4
23-
- uses: julia-actions/setup-julia@v1
23+
- uses: julia-actions/setup-julia@v2
2424
with:
2525
version: ${{ matrix.julia-version }}
2626
arch: x64
@@ -48,6 +48,8 @@ jobs:
4848
exit(0) # Exit immediately, as a success
4949
end
5050
- uses: julia-actions/julia-processcoverage@v1
51-
- uses: codecov/codecov-action@v3
51+
- uses: codecov/codecov-action@v4
5252
with:
5353
file: lcov.info
54+
token: ${{ secrets.CODECOV_TOKEN }}
55+
fail_ci_if_error: true

.github/workflows/Invalidations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: github.base_ref == github.event.repository.default_branch
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: julia-actions/setup-julia@v1
19+
- uses: julia-actions/setup-julia@v2
2020
with:
2121
version: '1'
2222
- uses: actions/checkout@v4

.github/workflows/SpellCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
- name: Checkout Actions Repository
1111
uses: actions/checkout@v4
1212
- name: Check spelling
13-
uses: crate-ci/typos@v1.17.0
13+
uses: crate-ci/typos@v1.18.0

.typos.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[default.extend-words]
22
Nd = "Nd"
33
nin = "nin"
4-
coul = "coul"
4+
coul = "coul"
5+
isconnection = "isconnection"

Project.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ModelingToolkitStandardLibrary"
22
uuid = "16a59e39-deab-5bd0-87e4-056b12336739"
33
authors = ["Chris Rackauckas and Julia Computing"]
4-
version = "2.3.4"
4+
version = "2.7.1"
55

66
[deps]
77
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
@@ -13,16 +13,16 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
1313

1414
[compat]
1515
Aqua = "0.8"
16-
ChainRulesCore = "1"
17-
ControlSystemsBase = "1"
18-
DataInterpolations = "4"
19-
DiffEqBase = "6.103"
16+
ChainRulesCore = "1.18"
17+
ControlSystemsBase = "1.4"
18+
DataInterpolations = "4.6"
19+
DiffEqBase = "6.147"
2020
IfElse = "0.1"
2121
LinearAlgebra = "1.10"
22-
ModelingToolkit = "8.69"
23-
OrdinaryDiffEq = "6.33"
22+
ModelingToolkit = "9.2"
23+
OrdinaryDiffEq = "6.72"
2424
SafeTestsets = "0.1"
25-
Symbolics = "5.2"
25+
Symbolics = "5.20"
2626
Test = "1"
2727
julia = "1.10"
2828

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ V = 1.0
6060
@named ground = Ground()
6161

6262
rc_eqs = [connect(constant.output, source.V)
63-
connect(source.p, resistor.p)
64-
connect(resistor.n, capacitor.p)
65-
connect(capacitor.n, source.n, ground.g)]
63+
connect(source.p, resistor.p)
64+
connect(resistor.n, capacitor.p)
65+
connect(capacitor.n, source.n, ground.g)]
6666

6767
@named rc_model = ODESystem(rc_eqs, t,
6868
systems = [resistor, capacitor, constant, source, ground])

0 commit comments

Comments
 (0)