Merge pull request #3953 from SciML/as/su-v4

refactor: update to SymbolicUtils@4 and Symbolics@7

Author: AayushSabharwal

.github/workflows/Documentation.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - v10
+      - 'as/su-v4'
     tags: '*'
   pull_request:
 
@@ -24,7 +25,7 @@ jobs:
           version: 'lts'
       - run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
       - name: Install dependencies
-        run: DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
+        run: DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=docs/ -e 'using Pkg; Pkg.develop([PackageSpec(path=pwd()), PackageSpec(path=joinpath(pwd(), "lib", "ModelingToolkitBase"))]); Pkg.instantiate()'
       - name: Build and deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token

.github/workflows/Downstream.yml

@@ -61,6 +61,7 @@ jobs:
           using Pkg
           try
             # force it to use this PR's version of the package
+            Pkg.develop(PackageSpec(path="./lib/ModelingToolkitBase"))  # resolver may fail with main deps
             Pkg.develop(PackageSpec(path="."))  # resolver may fail with main deps
             Pkg.update()
             Pkg.test(coverage=true)  # resolver may fail with test time deps

.github/workflows/FormatCheck.yml

@@ -11,4 +11,4 @@ on:
 jobs:
   format-check:
     name: "Format Check"
-    uses: "SciML/.github/.github/workflows/format-suggestions-on-pr.yml@v1"
+    uses: "SciML/.github/.github/workflows/format-check.yml@v1"

.github/workflows/Tests.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - master
       - 'release-'
-      - v10
+      - as/su-v4
     paths-ignore:
       - 'docs/**'
   push:
@@ -31,22 +31,80 @@ jobs:
           - "1"
           - "lts"
           - "pre"
-        group:
-          - InterfaceI
-          - InterfaceII
-          - Initialization
-          - SymbolicIndexingInterface
-          - Extended
-          - Extensions
-          - Downstream
-          - RegressionI
-          - FMI
-    uses: "SciML/.github/.github/workflows/tests.yml@master"
-    with:
-      julia-version: "${{ matrix.version }}"
-      group: "${{ matrix.group }}"
-      # Disable cache for self-hosted runners since they persist between runs
-      # Set USE_SELF_HOSTED repository variable to 'true' when using self-hosted runners
-      self-hosted: ${{ vars.USE_SELF_HOSTED == 'true' }}
-      cache: ${{ vars.USE_SELF_HOSTED != 'true' }}
-    secrets: "inherit"
+        pkggroup:
+          - ModelingToolkit/InterfaceI
+          - ModelingToolkit/InterfaceII
+          - ModelingToolkit/Initialization
+          - ModelingToolkit/SymbolicIndexingInterface
+          - ModelingToolkit/Extensions
+          - ModelingToolkit/Downstream
+          - ModelingToolkit/FMI
+          - ModelingToolkitBase/InterfaceI
+          - ModelingToolkitBase/InterfaceII
+          - ModelingToolkitBase/Initialization
+          - ModelingToolkitBase/SymbolicIndexingInterface
+          - ModelingToolkitBase/Extended
+          - ModelingToolkitBase/RegressionI
+          - ModelingToolkitBase/Extensions
+          - SciCompDSL/All
+    runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
+    steps:
+      - uses: actions/checkout@v5
+      - name: "Setup Julia ${{ matrix.version }}"
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: "${{ matrix.version }}"
+          arch: "${{ runner.arch }}"
+      - uses: julia-actions/cache@v2
+        if: ${{ vars.USE_SELF_HOSTED != 'true' }}
+        with:
+          token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: "Test ${{ matrix.pkggroup }}"
+        env:
+          PKGGROUP: ${{ matrix.pkggroup }}
+          JULIA_PKG_PRECOMPILE_AUTO: 0
+        shell: julia --color=yes --check-bounds=yes --depwarn=yes {0}
+        run: |
+          using Pkg
+          const PKGGROUP = ENV["PKGGROUP"]
+          const PKG = split(PKGGROUP, "/")[1]
+          const GROUP = split(PKGGROUP, "/")[2]
+          ENV["GROUP"] = GROUP
+
+          if PKG == "ModelingToolkitBase"
+            @info "Testing ModelingToolkitBase"
+            Pkg.activate("lib/ModelingToolkitBase")
+            @info "`dev`ing SciCompDSL"
+            Pkg.develop(; path = "lib/SciCompDSL")
+            @info "Running tests" GROUP
+            Pkg.test()
+          elseif PKG == "ModelingToolkit"
+            @info "Testing ModelingToolkit"
+            Pkg.activate(".")
+            @info "`dev`ing ModelingToolkitBase"
+            Pkg.develop(; path = "lib/ModelingToolkitBase")
+            @info "`dev`ing SciCompDSL"
+            Pkg.develop(; path = "lib/SciCompDSL")
+            @info "Running tests" GROUP
+            Pkg.test()
+          elseif PKG == "SciCompDSL"
+            @info "Testing SciCompDSL"
+            Pkg.activate("lib/SciCompDSL")
+            @info "`dev`ing ModelingToolkitBase"
+            Pkg.develop(; path = "lib/ModelingToolkitBase")
+            @info "`dev`ing ModelingToolkit"
+            Pkg.develop(; path = ".")
+            @info "Running tests" GROUP
+            Pkg.test()
+          else
+            error("Invalid package $PKG")
+          end
+      - uses: julia-actions/julia-processcoverage@v1
+        with:
+          directories: "src,ext,lib/ModelingToolkitBase/src,lib/ModelingToolkitBase/ext"
+      - name: "Report Coverage with Codecov"
+        uses: codecov/codecov-action@v5
+        with:
+          files: lcov.info
+          token: "${{ secrets.CODECOV_TOKEN }}"
+          fail_ci_if_error: true

LICENSE.md

@@ -32,29 +32,3 @@ The ModelingToolkit.jl package is licensed under the MIT "Expat" License:
 > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 > 
 > SOFTWARE.
-
-The code in `src/structural_transformation/bipartite_tearing/modia_tearing.jl`,
-which is from the [Modia.jl](https://github.com/ModiaSim/Modia.jl) project, is
-licensed as follows:
-
-MIT License
-
-Copyright (c) 2017-2018 ModiaSim developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.