Merge pull request #706 from devmotion/dw/compat

Update Julia compat to 1.10 and remove IfElse.jl

Author: ChrisRackauckas

.github/workflows/ci.yml

@@ -6,28 +6,26 @@ on:
   push:
     branches:
       - master
+
+# needed to allow julia-actions/cache to delete old caches that it has created
+permissions:
+  actions: write
+  contents: read
+
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version:
+          - 'min'
+          - '1'
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - run: |
-          if [ "`git rev-parse --abbrev-ref HEAD`" != master ]; then git fetch origin master:master; fi
       - uses: julia-actions/setup-julia@v2
         with:
-          version: 1
-      - uses: actions/cache@v4
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+          version: ${{ matrix.version }}
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1

Project.toml

@@ -13,7 +13,6 @@ ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
-IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MultivariatePolynomials = "102ac46a-7ee4-5c85-9060-abc95bfdeaa3"
@@ -46,7 +45,6 @@ ConstructionBase = "1.5.7"
 DataStructures = "0.18"
 DocStringExtensions = "0.8, 0.9"
 DynamicPolynomials = "0.5, 0.6"
-IfElse = "0.1"
 LabelledArrays = "1.5"
 MultivariatePolynomials = "0.5"
 NaNMath = "0.3, 1.1.2"
@@ -59,7 +57,7 @@ TermInterface = "2.0"
 TimerOutputs = "0.5"
 Unityper = "0.1.2"
 WeakValueDicts = "0.1.0"
-julia = "1.3"
+julia = "1.10"
 
 [extras]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"

src/SymbolicUtils.jl

@@ -30,7 +30,6 @@ include("types.jl")
 
 # Methods on symbolic objects
 using SpecialFunctions, NaNMath
-import IfElse: ifelse  # need to not bring IfElse name in or it will clash with Rewriters.IfElse
 include("methods.jl")
 
 # LinkedList, simplification utilities

src/code.jl

@@ -155,7 +155,7 @@ function function_to_expr(op::typeof(^), O, st)
     return nothing
 end
 
-function function_to_expr(::typeof(SymbolicUtils.ifelse), O, st)
+function function_to_expr(::typeof(ifelse), O, st)
     args = arguments(O)
     :($(toexpr(args[1], st)) ? $(toexpr(args[2], st)) : $(toexpr(args[3], st)))
 end

src/methods.jl

@@ -198,9 +198,8 @@ for f in [!, ~]
 end
 
 
-# An ifelse node, ifelse is a built-in unfortunately
-# So this uses IfElse.jl's ifelse that we imported
-function ifelse(_if::Symbolic{Bool}, _then, _else)
+# An ifelse node
+function Base.ifelse(_if::Symbolic{Bool}, _then, _else)
     Term{Union{symtype(_then), symtype(_else)}}(ifelse, Any[_if, _then, _else])
 end
 promote_symtype(::typeof(ifelse), _, ::Type{T}, ::Type{S}) where {T,S} = Union{T, S}

test/basics.jl

@@ -1,7 +1,6 @@
 using SymbolicUtils: Symbolic, Sym, FnType, Term, Add, Mul, Pow, symtype, operation, arguments, issym, isterm, BasicSymbolic, term, isequal_with_metadata
 using SymbolicUtils
 using ConstructionBase: setproperties
-using IfElse: ifelse
 using Setfield
 using Test, ReferenceTests
 

test/fuzzlib.jl

@@ -2,8 +2,6 @@ using SymbolicUtils
 using SymbolicUtils: Term, showraw, Symbolic, issym
 using SpecialFunctions
 using Test
-import IfElse: ifelse
-import IfElse
 using NaNMath
 
 function rand_input(T)