diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1fb75b732..c4052680e 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.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 index e4859c215..927389c0a 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 e12575ad9..ff434aa2d 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 96c4506a1..4f386cc4a 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 8c244c0be..b7c416ee4 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 530df9e97..807fb3288 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 15bfa09b7..a69445e17 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 23a73f57a..60c76faf6 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 2e39d5eab..e5ccce71d 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/and.m b/inst/@sym/and.m index 7a4506b57..6428a22e7 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/bernoulli.m b/inst/@sym/bernoulli.m index 037a1d17d..aa5f711d6 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/coeffs.m b/inst/@sym/coeffs.m index 682ef4ea9..971935e3a 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/dilog.m b/inst/@sym/dilog.m index 2c9351ad1..6e46a4e2b 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 diff --git a/inst/@sym/double.m b/inst/@sym/double.m index f9ff6a763..d3db0e601 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 diff --git a/inst/@sym/eq.m b/inst/@sym/eq.m index 0591fd7b1..b1ce83fe3 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/eval.m b/inst/@sym/eval.m index e08391630..265863913 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/ezmesh.m b/inst/@sym/ezmesh.m index 116d8719d..398bc1f9a 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 44cd916b8..1ea8ad226 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 a2c7333bd..0b930dd2a 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 5a1c7732b..78e8c33a3 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/fplot.m b/inst/@sym/fplot.m index a84ffcfe3..6e3fd6124 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 @@ -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 index 416d27df5..63ca45689 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/gammainc.m b/inst/@sym/gammainc.m index e3252824a..fbc56bab5 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/horzcat.m b/inst/@sym/horzcat.m index 8af7c13ef..a31e2bb40 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 0b48c5657..26db14905 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 8bc68a034..e2c797ab9 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 a1443c279..08989b5e9 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 982fe3733..3aaf12959 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 b315428a2..d664defd8 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 7df96f69d..636cdb40c 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/subs.m b/inst/@sym/subs.m index 1cdbe8ee0..66d786163 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/sym.m b/inst/@sym/sym.m index 56eef76c4..5a9ce1265 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/sym2poly.m b/inst/@sym/sym2poly.m index 71627e0d4..873f08b9a 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/@sym/vertcat.m b/inst/@sym/vertcat.m index 9f46f6dab..3a6907fa6 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 5ef6bc050..bc4f0456f 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 4d260ee60..0b00e67c3 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/heaviside.m b/inst/heaviside.m index 11c84071e..f1c5eeabe 100644 --- a/inst/heaviside.m +++ b/inst/heaviside.m @@ -1,5 +1,6 @@ -%% Copyright (C) 2006 Sylvain Pelissier -%% Copyright (C) 2015-2016, 2019, 2022 Colin B. Macdonald +%% 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 1c0391fe2..709a59874 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/poly2sym.m b/inst/poly2sym.m index b28d336cb..0c7a88df3 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 47374c8cc..e70558d94 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 a9bba88fc..ba0e2bca4 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 75b0e0ffa..d6cec7b3e 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 diff --git a/inst/vpa.m b/inst/vpa.m index 59320030e..cee5ced7b 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. @@ -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))