Merge pull request #1320 from gnu-octave/fixes_and_bumps

Fixes and bumps
gnu-octave · Feb 2, 2025 · 94f43c4 · 94f43c4
2 parents 0fe0f07 + b450ed9
commit 94f43c4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: FSFAP
-# Copyright (C) 2022-2024 Colin B. Macdonald
+# Copyright (C) 2022-2025 Colin B. Macdonald
 # Copyright (C) 2022 Chris Gorman
 # Copyright (C) 2022 Alex Vong
 # Copyright (C) 2023 Markus Mützel
@@ -50,24 +50,19 @@ jobs:
 
 
   appstream-validate:
-    # maybe a later Ubuntu will have appstream >= 1, for now we pull from flatpak
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - name: Install Flatpak and add Flathub
+      - name: Install appstreamcli
         run: |
           whoami
           uname -a
           sudo apt-get update
-          sudo apt-get install -y flatpak
-          sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y org.freedesktop.appstream.cli
-      - name: List appstream.cli version
-        run: |
-          flatpak run org.freedesktop.appstream.cli --version
+          sudo apt-get install -y appstream
+      - name: Version
+        run: appstreamcli --version
       - name: Validate
-        run: |
-          flatpak run org.freedesktop.appstream.cli validate --strict --pedantic --explain io.github.gnu_octave.symbolic.metainfo.xml
+        run: appstreamcli validate --strict --pedantic --explain io.github.gnu_octave.symbolic.metainfo.xml
 
 
   codespell:
@@ -90,9 +85,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        octave: [9.2.0]
+        octave: [9.3.0]
         sympy: [1.5.1, 1.6.2, 1.7.1, 1.8, 1.9, 1.10.1, 1.11.1, 1.12.1, 1.13.0, 1.13.3]
         include:
+          - octave: 9.2.0
+            sympy: 1.13.3
           - octave: 9.1.0
             sympy: 1.13.3
     steps:
@@ -210,7 +207,7 @@ jobs:
       fail-fast: true
       matrix:
         octave: [8.4.0]
-        sympy: [1.12]
+        sympy: [1.13.3]
     steps:
       - uses: actions/checkout@v4
       - name: Container setup
@@ -260,7 +257,7 @@ jobs:
       fail-fast: true
       matrix:
         octave: [8.4.0]
-        sympy: [1.12]
+        sympy: [1.13.3]
     steps:
       - uses: actions/checkout@v4
       - name: Container setup
@@ -304,8 +301,8 @@ jobs:
           docker rm oc
 
 
-  ubuntu2204_ootb:
-    runs-on: ubuntu-22.04
+  ubuntu-latest_ootb:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install Octave, Python and SymPy

diff --git a/inst/@sym/horner.m b/inst/@sym/horner.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2014-2016, 2019, 2022 Colin B. Macdonald
+%% Copyright (C) 2014-2016, 2019, 2022, 2025 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -22,7 +22,7 @@
 %% @defmethodx @@sym horner (@var{p}, @var{x})
 %% Convert a symbolic polynomial to Horner form.
 %%
-%% The Horner form minimizes the number of arthimetic operators to
+%% The Horner form minimizes the number of arithmetic operators to
 %% evaluate the polynomial.
 %%
 %% Example: