Merge pull request #1314 from gnu-octave/sympy113

CI: add tests on Sympy 1.13.3
gnu-octave · Nov 12, 2024 · a9a964d · a9a964d
2 parents 2a0ffc0 + 0aa981d
commit a9a964d
Show file tree

Hide file tree

Showing 43 changed files with 75 additions and 83 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -91,10 +91,10 @@ jobs:
       fail-fast: false
       matrix:
         octave: [9.2.0]
-        sympy: [1.5.1, 1.6.2, 1.7.1, 1.8, 1.9, 1.10.1, 1.11.1, 1.12]
+        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.1.0
-            sympy: 1.12
+            sympy: 1.13.3
     steps:
       - uses: actions/checkout@v4
       - name: Container setup
@@ -141,30 +141,28 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - octave: 5.2.0
-            sympy: 1.8
           - octave: 6.1.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 6.2.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 6.3.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 6.4.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 7.1.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 7.2.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 7.3.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 8.1.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 8.2.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 8.3.0
-            sympy: 1.12
+            sympy: 1.13.3
           - octave: 8.4.0
-            sympy: 1.12
+            sympy: 1.13.3
     steps:
       - uses: actions/checkout@v4
       - name: Container setup

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -11,6 +11,6 @@ Description: Adds symbolic calculation features to GNU Octave.  These
  toolboxes is intended.
 Categories: symbolic
 Url: https://octave.sourceforge.io/symbolic
-Depends: octave (>= 5.2)
+Depends: octave (>= 6.1)
 SystemRequirements: python, sympy (>= 1.5.1), mpmath (>= 1.0)
 License: GPL-3.0-or-later
diff --git a/inst/@double/bernoulli.m b/inst/@double/bernoulli.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2018-2019, 2022-2023 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2018-2019, 2022-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -36,8 +37,6 @@
 %% but for certain the absolute value is one half:
 %% @example
 %% @group
-%% @c Would render with an extra zero on earlier Octave
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% abs (bernoulli (1))
 %%   @result{} 0.5000
 %% @end group

diff --git a/inst/@double/chebyshevT.m b/inst/@double/chebyshevT.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2018-2019, 2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2018-2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -28,7 +29,6 @@
 %% Example:
 %% @example
 %% @group
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% chebyshevT (18, 0.9)
 %%   @result{} ans = -0.2614
 %% @end group

diff --git a/inst/@double/chebyshevU.m b/inst/@double/chebyshevU.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2018-2019, 2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2018-2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -45,15 +46,13 @@
 %%   @result{} C = (sym)
 %%             10         8         6        4       2
 %%       1024⋅x   - 2304⋅x  + 1792⋅x  - 560⋅x  + 60⋅x  - 1
-%% @c doctest: +XFAIL_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% value1 = polyval (sym2poly (C), 0.96105)
 %%   @result{} value1 = 0.2219
 %% @end group
 %% @end example
 %% Instead, we could use the present function:
 %% @example
 %% @group
-%% @c doctest: +XFAIL_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% value2 = chebyshevU (10, 0.96105)
 %%   @result{} value2 = 0.2219
 %% @end group

diff --git a/inst/@double/coshint.m b/inst/@double/coshint.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2016-2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2016-2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -24,7 +25,6 @@
 %% Example:
 %% @example
 %% @group
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% coshint (1.1)
 %%   @result{} ans = 0.9907
 %% @end group

diff --git a/inst/@double/cosint.m b/inst/@double/cosint.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2016-2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2016-2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -24,7 +25,6 @@
 %% Example:
 %% @example
 %% @group
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% cosint (1.1)
 %%   @result{} ans = 0.3849
 %% @end group

diff --git a/inst/@double/fresnelc.m b/inst/@double/fresnelc.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2016-2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2016-2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -24,7 +25,6 @@
 %% Example:
 %% @example
 %% @group
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% fresnelc (1.1)
 %%   @result{} ans = 0.7638
 %% @end group

diff --git a/inst/@double/fresnels.m b/inst/@double/fresnels.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2016-2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2016-2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -24,7 +25,6 @@
 %% Example:
 %% @example
 %% @group
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% fresnels (1.1)
 %%   @result{} ans = 0.5365
 %% @end group

diff --git a/inst/@sym/and.m b/inst/@sym/and.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016, 2018, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/bernoulli.m b/inst/@sym/bernoulli.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2014-2016, 2018-2019, 2022-2023 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2014-2016, 2018-2019, 2022-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%

diff --git a/inst/@sym/coeffs.m b/inst/@sym/coeffs.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2017, 2019, 2022-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/dilog.m b/inst/@sym/dilog.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2016, 2018-2019, 2022-2023 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2016, 2018-2019, 2022-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -25,7 +26,7 @@
 %% @example
 %% @group
 %% syms z
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.12")'))
+%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) >= Version("1.13.0")'))
 %% dilog (z)
 %%   @result{} ans = (sym) Li₂(1 - z)
 %% @end group

diff --git a/inst/@sym/double.m b/inst/@sym/double.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2014-2017, 2019, 2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2014-2017, 2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -26,7 +27,6 @@
 %% @group
 %% x = sym(1) / 3
 %%   @result{} x = (sym) 1/3
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% double (x)
 %%   @result{} ans =  0.3333
 %% @end group

diff --git a/inst/@sym/eq.m b/inst/@sym/eq.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014, 2016, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/eval.m b/inst/@sym/eval.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2019, 2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -27,10 +28,8 @@
 %% @group
 %% f = 2*sin(sym(3))
 %%   @result{} f = (sym) 2⋅sin(3)
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% eval(f)
 %%   @result{} ans = 0.2822
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% double(f)
 %%   @result{} ans = 0.2822
 %% @end group
@@ -58,7 +57,6 @@
 %% f
 %%   @result{} f = (sym) x⋅sin(y)
 %%
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% eval(f)
 %%   @result{} ans = 0.5024
 %% @end group

diff --git a/inst/@sym/ezmesh.m b/inst/@sym/ezmesh.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2019, 2023-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/ezplot3.m b/inst/@sym/ezplot3.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016, 2023-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/ezsurf.m b/inst/@sym/ezsurf.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2016-2017, 2019, 2023-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/fourier.m b/inst/@sym/fourier.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016, 2019, 2024 Colin B. Macdonald
 %% Copyright (C) 2015-2016 Andrés Prieto
 %% Copyright (C) 2015 Alexander Misel

diff --git a/inst/@sym/fplot.m b/inst/@sym/fplot.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2023 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2023-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -47,7 +48,6 @@
 %% @group
 %% syms x
 %%
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% [xx, yy] = fplot (sin (x), [0 1])
 %%   @result{} xx =
 %%       0
@@ -164,7 +164,7 @@
 %!test
 %! % bounds as syms, regular handle for function
 %! % fails on 6.1.0, maybe earlier too?
-%! if (compare_versions (OCTAVE_VERSION (), '6.1.0', '!='))
+%! if (compare_versions (OCTAVE_VERSION (), '6.1.0', '>'))
 %!   dom = [1 2];
 %!   fplot (@cos, sym (dom));
 %!   assert (get (gca, 'xlim'), dom(1:2))

diff --git a/inst/@sym/function_handle.m b/inst/@sym/function_handle.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2019, 2023-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/gammainc.m b/inst/@sym/gammainc.m
@@ -1,4 +1,5 @@
-%% Copyright (C) 2016, 2018-2019, 2022 Colin B. Macdonald
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2016, 2018-2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -48,15 +49,13 @@
 %% and does not effect operations on the results:
 %% @example
 %% @group
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% gammainc(3, 1)
 %%   @result{} ans = 0.9502
 %% gammainc(x, a)
 %%   @result{} (sym)
 %%       γ(a, x)
 %%       ───────
 %%         Γ(a)
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% double(subs(ans, [x a], [3 1]))
 %%   @result{} ans = 0.9502
 %% @end group

diff --git a/inst/@sym/horzcat.m b/inst/@sym/horzcat.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2017, 2019, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/ifourier.m b/inst/@sym/ifourier.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016, 2018-2019, 2022, 2024 Colin B. Macdonald
 %% Copyright (C) 2015-2016 Andrés Prieto
 %% Copyright (C) 2015 Alexander Misel

diff --git a/inst/@sym/ilaplace.m b/inst/@sym/ilaplace.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016 Andrés Prieto
 %% Copyright (C) 2015-2016, 2018-2019, 2022-2024 Colin Macdonald
 %%

diff --git a/inst/@sym/isAlways.m b/inst/@sym/isAlways.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016, 2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/laplace.m b/inst/@sym/laplace.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016 Andrés Prieto
 %% Copyright (C) 2015-2016, 2019, 2024 Colin Macdonald
 %%

diff --git a/inst/@sym/logical.m b/inst/@sym/logical.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2016, 2019, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

diff --git a/inst/@sym/private/mat_rclist_asgn.m b/inst/@sym/private/mat_rclist_asgn.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014, 2016-2017, 2019, 2022, 2024 Colin B. Macdonald
 %% Copyright (C) 2020 Mike Miller
 %% Copyright (C) 2020 Fernando Alvarruiz

diff --git a/inst/@sym/subs.m b/inst/@sym/subs.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2017, 2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
@@ -96,7 +96,6 @@
 %%       @@(x) exp (sin (x))
 %% @end group
 %%
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% @group
 %% fh(linspace(0, 2*pi, 700)')
 %%   @result{} ans =

diff --git a/inst/@sym/sym.m b/inst/@sym/sym.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2014-2019, 2022-2024 Colin B. Macdonald
 %% Copyright (C) 2016 Lagu
 %%