and patiently again

SINTEF · Jan 2, 2025 · 6b02106 · 6b02106
1 parent 3139368
commit 6b02106
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 78 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         version:
           - '1.10'

diff --git a/Project.toml b/Project.toml
@@ -6,14 +6,15 @@ version = "0.4.0"
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
 MacroTools = "0.5"
+SparseArrays = "1"
 SpecialFunctions = "2"
 StaticArrays = "1"
-SparseArrays = "1"
 julia = "1.10,1.11"
diff --git a/src/Multiplex.jl b/src/Multiplex.jl
diff --git a/src/Muscade.jl b/src/Muscade.jl
@@ -14,8 +14,6 @@ module Muscade
     export  value,VALUE,∂,value_∂ # \partial, \nabla
     export  constants,precedence,npartial,norm
 
-    include("Multiplex.jl")
-
     include("Dots.jl")
     export dots,∘₀,∘₁,∘₂,⊗
 

diff --git a/test/Project.toml b/test/Project.toml
@@ -5,6 +5,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Muscade = "93488820-1883-11ed-0c34-05177b029e4d"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

diff --git a/test/TestMultiplex.jl b/test/TestMultiplex.jl
diff --git a/test/run.jl b/test/run.jl
@@ -0,0 +1,8 @@
+test    = @__DIR__
+muscade = normpath(joinpath(test,".."))
+#docs    = normpath(joinpath(test,"../docs"))
+using Pkg
+Pkg.activate(test)
+#using Muscade # seems necessary for doc test to work on a cold start
+include(normpath(joinpath(test,"runtests.jl")))
+Pkg.activate(muscade) 
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,10 +1,3 @@
-test    = @__DIR__
-muscade = normpath(joinpath(test,".."))
-docs    = normpath(joinpath(test,"../docs"))
-import Pkg; Pkg.add("Pkg") # for CI on headless server
-#using Pkg
-Pkg.activate(test)
-using Muscade # seems necessary for doc test to work on a cold start
 module Runtest
     using Test,Literate, DocumenterCitations,Printf,Documenter,Muscade
 
@@ -18,9 +11,6 @@ module Runtest
         @testset "TestAdiff" begin
             include("TestAdiff.jl")
         end
-        @testset "TestMultiplex" begin
-            include("TestMultiplex.jl")
-        end
         @testset "TestModelDescription" begin
             include("TestModelDescription.jl")
         end
@@ -66,5 +56,3 @@ module Runtest
         # doctest(Muscade) we do not use doctest, we run Literate.jl on mydemo.jl files that are included in a unit test file
     end
 end
-
-Pkg.activate(muscade)