From 213f5d2842b774f888fb9c2c04e3dfb48d53f770 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 17:20:51 -0800
Subject: [PATCH 1/9] bump sympy to 1.13.3

---
 .github/workflows/main.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1fb75b73..b724d9ef 100644
--- 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.3]
         include:
           - octave: 9.1.0
-            sympy: 1.12
+            sympy: 1.13.3
     steps:
       - uses: actions/checkout@v4
       - name: Container setup
@@ -144,27 +144,27 @@ jobs:
           - 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

From 930148a79b4ba3a9790a34cddca34062647746e6 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 18:19:00 -0800
Subject: [PATCH 2/9] adjust test for sympy versions

---
 inst/vpa.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inst/vpa.m b/inst/vpa.m
index 59320030..aa224cd3 100644
--- a/inst/vpa.m
+++ b/inst/vpa.m
@@ -382,7 +382,7 @@
 
 %!test
 %! % non-equality of vpa that "might be" be integers: Issue #1285
-%! if (pycall_sympy__ ('return Version(spver) >= Version("1.12.1")'))
+%! if (pycall_sympy__ ('return Version(spver) >= Version("1.13.0")'))
 %!   a = vpa ("123", 32);
 %!   b = vpa ("123", 64);
 %!   assert (~ isequal (a, b))

From 8ec00aa2bbce326dab7f362690aa1494392f3479 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 18:42:35 -0800
Subject: [PATCH 3/9] drop support for Octave 5

---
 .github/workflows/main.yml | 4 +---
 DESCRIPTION                | 2 +-
 inst/@double/bernoulli.m   | 5 ++---
 inst/@double/chebyshevT.m  | 4 ++--
 inst/@double/chebyshevU.m  | 5 ++---
 inst/@double/coshint.m     | 4 ++--
 inst/@double/cosint.m      | 4 ++--
 inst/@double/fresnelc.m    | 4 ++--
 inst/@double/fresnels.m    | 4 ++--
 inst/@sym/bernoulli.m      | 3 ++-
 inst/@sym/double.m         | 5 ++---
 inst/@sym/eval.m           | 6 ++----
 inst/@sym/fplot.m          | 7 +++----
 inst/@sym/gammainc.m       | 5 ++---
 inst/@sym/subs.m           | 3 +--
 inst/@sym/sym2poly.m       | 4 ++--
 inst/heaviside.m           | 7 +++----
 inst/laguerreL.m           | 5 ++---
 inst/vpa.m                 | 2 +-
 19 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b724d9ef..2ee981ab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -91,7 +91,7 @@ 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.1, 1.13.3]
+        sympy: [1.6.2, 1.7.1, 1.8, 1.9, 1.10.1, 1.11.1, 1.12.1, 1.13.3]
         include:
           - octave: 9.1.0
             sympy: 1.13.3
@@ -141,8 +141,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - octave: 5.2.0
-            sympy: 1.8
           - octave: 6.1.0
             sympy: 1.13.3
           - octave: 6.2.0
diff --git a/DESCRIPTION b/DESCRIPTION
index e4859c21..927389c0 100644
--- 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
index e12575ad..ff434aa2 100644
--- 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
index 96c4506a..4f386cc4 100644
--- 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
index 8c244c0b..b7c416ee 100644
--- 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,7 +46,6 @@
 %%   @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
@@ -53,7 +53,6 @@
 %% 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
index 530df9e9..807fb328 100644
--- 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
index 15bfa09b..a69445e1 100644
--- 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
index 23a73f57..60c76faf 100644
--- 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
index 2e39d5ea..e5ccce71 100644
--- 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/bernoulli.m b/inst/@sym/bernoulli.m
index 037a1d17..aa5f711d 100644
--- 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/double.m b/inst/@sym/double.m
index f9ff6a76..9305e135 100644
--- 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
@@ -46,7 +46,6 @@
 %% @example
 %% @group
 %% syms x
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.9")'))
 %% double (x)
 %%   @print{} ??? ... Cannot convert expression ...
 %% @end group
diff --git a/inst/@sym/eval.m b/inst/@sym/eval.m
index e0839163..26586391 100644
--- 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/fplot.m b/inst/@sym/fplot.m
index a84ffcfe..23fd5d68 100644
--- 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
@@ -58,7 +58,6 @@
 %%       ...
 %%       0.8415
 %%
-%% @c doctest: +SKIP
 %% plot (xx, yy)
 %% @end group
 %% @end example
@@ -164,7 +163,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/gammainc.m b/inst/@sym/gammainc.m
index e3252824..fbc56bab 100644
--- 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,7 +49,6 @@
 %% 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)
@@ -56,7 +56,6 @@
 %%       γ(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/subs.m b/inst/@sym/subs.m
index 1cdbe8ee..66d78616 100644
--- 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/sym2poly.m b/inst/@sym/sym2poly.m
index 71627e0d..873f08b9 100644
--- a/inst/@sym/sym2poly.m
+++ b/inst/@sym/sym2poly.m
@@ -1,5 +1,6 @@
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2003 Willem J. Atsma
-%% Copyright (C) 2014-2016, 2019 Colin B. Macdonald
+%% Copyright (C) 2014-2016, 2019, 2024 Colin B. Macdonald
 %%
 %% This program is free software; you can redistribute it and/or
 %% modify it under the terms of the GNU General Public
@@ -44,7 +45,6 @@
 %% @example
 %% @group
 %% syms x
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% double(sym2poly(pi*x^3 + 3*x/2 + exp(sym(1))))
 %%    @result{}     3.1416      0   1.5000   2.7183
 %% @end group
diff --git a/inst/heaviside.m b/inst/heaviside.m
index 11c84071..f1c5eeab 100644
--- a/inst/heaviside.m
+++ b/inst/heaviside.m
@@ -1,5 +1,6 @@
-%% Copyright (C) 2006 Sylvain Pelissier <sylvain.pelissier@gmail.com>
-%% Copyright (C) 2015-2016, 2019, 2022 Colin B. Macdonald <cbm@m.fsf.org>
+%% SPDX-License-Identifier: GPL-3.0-or-later
+%% Copyright (C) 2006 Sylvain Pelissier
+%% Copyright (C) 2015-2016, 2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This program is free software; you can redistribute it and/or modify it under
 %% the terms of the GNU General Public License as published by the Free Software
@@ -35,8 +36,6 @@
 %% function returns 0.5 by default:
 %% @example
 %% @group
-%% @c Would render with an extra zero on earlier Octave
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% heaviside(0)
 %%   @result{} 0.5000
 %% @end group
diff --git a/inst/laguerreL.m b/inst/laguerreL.m
index 1c0391fe..709a5987 100644
--- a/inst/laguerreL.m
+++ b/inst/laguerreL.m
@@ -1,6 +1,7 @@
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2008 Eric Chassande-Mottin
 %% Copyright (C) 2011 Carnë Draug
-%% Copyright (C) 2016, 2018, 2022 Colin B. Macdonald
+%% Copyright (C) 2016, 2018, 2022, 2024 Colin B. Macdonald
 %%
 %% This program is free software; you can redistribute it and/or modify it under
 %% the terms of the GNU General Public License as published by the Free Software
@@ -26,7 +27,6 @@
 %% the point 6 is
 %% @example
 %% @group
-%% @c doctest: +SKIP_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% laguerreL (14, 6)
 %%   @result{} 0.9765
 %% @end group
@@ -52,7 +52,6 @@
 %% @example
 %% @group
 %% coeffs = sym2poly (L);
-%% @c doctest: +XFAIL_IF(compare_versions (OCTAVE_VERSION(), '6.0.0', '<'))
 %% polyval (coeffs, 6)
 %%   @result{} 0.9765
 %% err = ans - double (exact);
diff --git a/inst/vpa.m b/inst/vpa.m
index aa224cd3..cee5ced7 100644
--- a/inst/vpa.m
+++ b/inst/vpa.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, 2021-2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.

From 13689bbed8f5706ca72e668ae682513b556bd2d4 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 18:45:19 -0800
Subject: [PATCH 4/9] Revert accidental AGPLv3 back to GPLv3

See 03134a0d9; changing licenses was not intended at this time.
---
 inst/@sym/and.m                          | 2 +-
 inst/@sym/coeffs.m                       | 2 +-
 inst/@sym/eq.m                           | 2 +-
 inst/@sym/ezmesh.m                       | 2 +-
 inst/@sym/ezplot3.m                      | 2 +-
 inst/@sym/ezsurf.m                       | 2 +-
 inst/@sym/fourier.m                      | 2 +-
 inst/@sym/function_handle.m              | 2 +-
 inst/@sym/horzcat.m                      | 2 +-
 inst/@sym/ifourier.m                     | 2 +-
 inst/@sym/ilaplace.m                     | 2 +-
 inst/@sym/isAlways.m                     | 2 +-
 inst/@sym/laplace.m                      | 2 +-
 inst/@sym/logical.m                      | 2 +-
 inst/@sym/private/mat_rclist_asgn.m      | 2 +-
 inst/@sym/sym.m                          | 2 +-
 inst/@sym/vertcat.m                      | 2 +-
 inst/@symfun/int.m                       | 2 +-
 inst/findsymbols.m                       | 2 +-
 inst/poly2sym.m                          | 2 +-
 inst/private/assert_pythonic_and_sympy.m | 2 +-
 inst/private/python_copy_vars_to.m       | 2 +-
 inst/private/python_ipc_popen2.m         | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/inst/@sym/and.m b/inst/@sym/and.m
index 7a4506b5..6428a22e 100644
--- 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/coeffs.m b/inst/@sym/coeffs.m
index 682ef4ea..971935e3 100644
--- 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/eq.m b/inst/@sym/eq.m
index 0591fd7b..b1ce83fe 100644
--- 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/ezmesh.m b/inst/@sym/ezmesh.m
index 116d8719..398bc1f9 100644
--- 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
index 44cd916b..1ea8ad22 100644
--- 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
index a2c7333b..0b930dd2 100644
--- 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
index 5a1c7732..78e8c33a 100644
--- 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/function_handle.m b/inst/@sym/function_handle.m
index 416d27df..63ca4568 100644
--- 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/horzcat.m b/inst/@sym/horzcat.m
index 8af7c13e..a31e2bb4 100644
--- 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
index 0b48c565..26db1490 100644
--- 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
index 8bc68a03..e2c797ab 100644
--- 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
index a1443c27..08989b5e 100644
--- 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
index 982fe373..3aaf1295 100644
--- 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
index b315428a..d664defd 100644
--- 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
index 7df96f69..636cdb40 100644
--- 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/sym.m b/inst/@sym/sym.m
index 56eef76c..5a9ce126 100644
--- 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
 %%
diff --git a/inst/@sym/vertcat.m b/inst/@sym/vertcat.m
index 9f46f6da..3a6907fa 100644
--- a/inst/@sym/vertcat.m
+++ b/inst/@sym/vertcat.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/@symfun/int.m b/inst/@symfun/int.m
index 5ef6bc05..bc4f0456 100644
--- a/inst/@symfun/int.m
+++ b/inst/@symfun/int.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/findsymbols.m b/inst/findsymbols.m
index 4d260ee6..0b00e67c 100644
--- a/inst/findsymbols.m
+++ b/inst/findsymbols.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
 %%
 %% This file is part of OctSymPy.
diff --git a/inst/poly2sym.m b/inst/poly2sym.m
index b28d336c..0c7a88df 100644
--- a/inst/poly2sym.m
+++ b/inst/poly2sym.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2003 Willem J. Atsma
 %% Copyright (C) 2014-2016, 2024 Colin B. Macdonald
 %%
diff --git a/inst/private/assert_pythonic_and_sympy.m b/inst/private/assert_pythonic_and_sympy.m
index 47374c8c..e70558d9 100644
--- a/inst/private/assert_pythonic_and_sympy.m
+++ b/inst/private/assert_pythonic_and_sympy.m
@@ -1,4 +1,4 @@
-%% SPDX-License-Identifier: AGPL-3.0-or-later
+%% SPDX-License-Identifier: GPL-3.0-or-later
 %% Copyright (C) 2019, 2022, 2024 Colin B. Macdonald
 %% Copyright (C) 2022-2023 Alex Vong
 %%
diff --git a/inst/private/python_copy_vars_to.m b/inst/private/python_copy_vars_to.m
index a9bba88f..ba0e2bca 100644
--- a/inst/private/python_copy_vars_to.m
+++ b/inst/private/python_copy_vars_to.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, 2023-2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
diff --git a/inst/private/python_ipc_popen2.m b/inst/private/python_ipc_popen2.m
index 75b0e0ff..d6cec7b3 100644
--- a/inst/private/python_ipc_popen2.m
+++ b/inst/private/python_ipc_popen2.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) 2018, 2020 Mike Miller
 %% Copyright (C) 2022 Alex Vong

From 107e9aefee3bf5a13e886b7bc7cb309e81334922 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 18:52:14 -0800
Subject: [PATCH 5/9] test needs sympy 1.13

---
 inst/@sym/dilog.m | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inst/@sym/dilog.m b/inst/@sym/dilog.m
index 2c9351ad..6e46a4e2 100644
--- 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

From 1a6756dcb740b362a168ed1fc6d4ce5853df7482 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 19:33:13 -0800
Subject: [PATCH 6/9] CI: add sympy 1.5.1 back, and add 1.13.0

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2ee981ab..c4052680 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -91,7 +91,7 @@ jobs:
       fail-fast: false
       matrix:
         octave: [9.2.0]
-        sympy: [1.6.2, 1.7.1, 1.8, 1.9, 1.10.1, 1.11.1, 1.12.1, 1.13.3]
+        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.13.3

From cf77d3c2a4603a1e9820042905c79025b83238e4 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 19:35:23 -0800
Subject: [PATCH 7/9] oops swapped logic

---
 inst/@sym/fplot.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inst/@sym/fplot.m b/inst/@sym/fplot.m
index 23fd5d68..3cb1bf38 100644
--- a/inst/@sym/fplot.m
+++ b/inst/@sym/fplot.m
@@ -163,7 +163,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))

From 947693fbe1407fcddb7cfaed32940f8ea1bdcd3d Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 19:47:22 -0800
Subject: [PATCH 8/9] skip the actual plots

---
 inst/@sym/fplot.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inst/@sym/fplot.m b/inst/@sym/fplot.m
index 3cb1bf38..6e3fd612 100644
--- a/inst/@sym/fplot.m
+++ b/inst/@sym/fplot.m
@@ -58,6 +58,7 @@
 %%       ...
 %%       0.8415
 %%
+%% @c doctest: +SKIP
 %% plot (xx, yy)
 %% @end group
 %% @end example

From 0aa981d039c2956894035477add8ab07cae0992e Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Mon, 11 Nov 2024 20:05:27 -0800
Subject: [PATCH 9/9] replace accidentally removed exception

---
 inst/@sym/double.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inst/@sym/double.m b/inst/@sym/double.m
index 9305e135..d3db0e60 100644
--- a/inst/@sym/double.m
+++ b/inst/@sym/double.m
@@ -46,6 +46,7 @@
 %% @example
 %% @group
 %% syms x
+%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.9")'))
 %% double (x)
 %%   @print{} ??? ... Cannot convert expression ...
 %% @end group