Merge branch 'main' into dev_cargo

.github/workflows/CI.yml

@@ -4,6 +4,12 @@ on:
     branches: [main]
   pull_request:
     types: [opened, synchronize, reopened]
+
+# needed to allow julia-actions/cache to delete old caches that it has created
+permissions:
+  actions: write
+  contents: read
+
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -12,40 +18,39 @@ jobs:
       fail-fast: false
       matrix:
           version: 
-              - '1.8'
+              - '1.9'
               - '1'
           os: 
               - ubuntu-latest
           arch: 
               - x64
     steps:
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v2
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Julia
+        uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v4
+
+      - name: Cache Julia artifacts
+        uses: julia-actions/cache@v2
         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 }}-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.9'
-          #cache: 'pip' # caching pip dependencies
-      - run: pip install matplotlib
-      - uses: julia-actions/julia-buildpkg@v1
-        env:
-         PYTHON: ""
-      - uses: julia-actions/julia-runtest@v1
+
+      - name: Build Julia package
+        uses: julia-actions/julia-buildpkg@v1
+
+      - name: Run Julia tests
+        uses: julia-actions/julia-runtest@v1
         with:
           depwarn: error
-      - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+
+      - name: Process coverage
+        uses: julia-actions/julia-processcoverage@v1
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
         with:
           file: lcov.info

.gitignore

@@ -19,4 +19,4 @@ Manifest.toml
 docs/build/*
 .VSCodeCounter/*
 .vscode/*
-
+.CondaPkg/*

CondaPkg.toml

@@ -0,0 +1,3 @@
+[deps]
+matplotlib = "3.8"
+python = "==3.9"

Project.toml

@@ -6,6 +6,7 @@ version = "3.0.0-beta"
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
@@ -16,7 +17,8 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
 NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
+PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
+PythonPlot = "274fc56d-3b97-40fa-a1cd-1b4a50311bf9"
 Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"