Dropping SymPy 1.4 support

gnu-octave · Jan 28, 2024 · 181e754 · 181e754
1 parent 645b491
commit 181e754
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 53 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: FSFAP
-# Copyright (C) 2022-2023 Colin B. Macdonald
+# Copyright (C) 2022-2024 Colin B. Macdonald
 # Copyright (C) 2022 Chris Gorman
 # Copyright (C) 2022 Alex Vong
 # Copyright (C) 2023 Markus Mützel
@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         octave: [8.4.0]
-        sympy: [1.4, 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]
         include:
           - octave: 5.1.0
             sympy: 1.8

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,5 +12,5 @@ Description: Adds symbolic calculation features to GNU Octave.  These
 Categories: symbolic
 Url: https://octave.sourceforge.io/symbolic
 Depends: octave (>= 5.1)
-SystemRequirements: python, sympy (>= 1.4), mpmath (>= 1.0)
+SystemRequirements: python, sympy (>= 1.5.1), mpmath (>= 1.0)
 License: GPL-3.0-or-later
diff --git a/inst/@sym/airy.m b/inst/@sym/airy.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2016, 2019 Colin B. Macdonald
+%% Copyright (C) 2016, 2019, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -29,23 +29,18 @@
 %% @example
 %% @group
 %% syms z
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% Ai = airy(0, z)
 %%   @result{} Ai = (sym) Ai(z)
 %%
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% Bi = airy(2, z)
 %%   @result{} Bi = (sym) Bi(z)
 %%
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% Bi_prime = airy(3, z)
 %%   @result{} Bi_prime = (sym) Bi'(z)
 %%
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% diff(Bi, z)
 %%   @result{} (sym) Bi'(z)
 %%
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% diff(Bi, z, z)
 %%   @result{} (sym) z⋅Bi(z)
 %% @end group

diff --git a/inst/@sym/beta.m b/inst/@sym/beta.m
@@ -1,5 +1,5 @@
 %% Copyright (C) 2016 Lagu
-%% Copyright (C) 2018-2019, 2022 Colin B. Macdonald
+%% Copyright (C) 2018-2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -34,7 +34,6 @@
 %% The beta function is related to the gamma function:
 %% @example
 %% @group
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% rewrite (beta (x,y), "gamma")
 %%   @result{}
 %%     ans = (sym)

diff --git a/inst/@sym/fresnelc.m b/inst/@sym/fresnelc.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2016, 2018-2019, 2022 Colin B. Macdonald
+%% Copyright (C) 2016, 2018-2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -24,10 +24,10 @@
 %% Example:
 %% @example
 %% @group
-%% @c doctest: +XFAIL_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
-%% z = fresnelc(sym('x'))
+%% syms x
+%% z = fresnelc (x)
 %%   @result{} z = (sym) C(x)
-%% diff(z)
+%% diff (z)
 %%   @result{} (sym)
 %%          ⎛   2⎞
 %%          ⎜π⋅x ⎟

diff --git a/inst/@sym/fresnels.m b/inst/@sym/fresnels.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2016, 2018-2019, 2022 Colin B. Macdonald
+%% Copyright (C) 2016, 2018-2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -24,10 +24,10 @@
 %% Example:
 %% @example
 %% @group
-%% @c doctest: +XFAIL_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
-%% z = fresnels(sym('x'))
+%% syms x
+%% z = fresnels (x)
 %%   @result{} z = (sym) S(x)
-%% diff(z)
+%% diff (z)
 %%   @result{} (sym)
 %%          ⎛   2⎞
 %%          ⎜π⋅x ⎟

diff --git a/inst/@sym/harmonic.m b/inst/@sym/harmonic.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2017-2019, 2022 Colin B. Macdonald
+%% Copyright (C) 2017-2019, 2022, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -27,7 +27,6 @@
 %% syms n integer
 %% y = harmonic (n)
 %%   @result{} y = (sym) harmonic(n)
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% rewrite (y, 'Sum')
 %%   @result{} (sym)
 %%

diff --git a/inst/@sym/heaviside.m b/inst/@sym/heaviside.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2014-2016, 2018-2019, 2022 Colin B. Macdonald
+%% Copyright (C) 2014-2016, 2018-2019, 2022, 2024 Colin B. Macdonald
 %% Copyright (C) 2022 Chris Gorman
 %%
 %% This file is part of OctSymPy.
@@ -27,7 +27,6 @@
 %% @example
 %% @group
 %% syms x
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% y = heaviside (x)
 %%   @result{} y = (sym) θ(x)
 %% @end group
@@ -37,7 +36,6 @@
 %% returns the midpoint by default.
 %% @example
 %% @group
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.8")'))
 %% heaviside(sym(0))
 %%   @result{} (sym) 1/2
 %% @end group

diff --git a/inst/@sym/ilaplace.m b/inst/@sym/ilaplace.m
@@ -1,5 +1,5 @@
 %% Copyright (C) 2014-2016 Andrés Prieto
-%% Copyright (C) 2015-2016, 2018-2019, 2022-2023 Colin Macdonald
+%% Copyright (C) 2015-2016, 2018-2019, 2022-2024 Colin Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -49,7 +49,6 @@
 %% @group
 %% syms s t
 %% F = 1/s^2;
-%% @c doctest: +XFAIL_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ilaplace(F, s, t)
 %%   @result{} (sym) t⋅θ(t)
 %% @end group

diff --git a/inst/@sym/laguerreL.m b/inst/@sym/laguerreL.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2016, 2018-2019 Colin B. Macdonald
+%% Copyright (C) 2016, 2018-2019, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -61,7 +61,6 @@
 %% @group
 %% syms x
 %% N = -3;
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% y = laguerreL(N, x)
 %%   @result{} y = (sym)
 %%       ⎛ 2          ⎞
@@ -73,10 +72,8 @@
 %% These satisfy Laguerre's differential equation:
 %% @example
 %% @group
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% x*diff(y, x, x) + (1 - x)*diff(y, x) + N*y == 0
 %%   @result{} (sym) ...
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% simplify(ans)
 %%   @result{} (sym) True
 %% @end group
@@ -114,10 +111,8 @@
 %!shared
 
 %!test
-%! if (pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %! syms x
 %! assert (isequal (laguerreL (-3, x), exp(x)*(x^2/2 + 2*x + 1)))
-%! end
 
 %!test
 %! syms x n

diff --git a/inst/@sym/round.m b/inst/@sym/round.m
@@ -1,6 +1,6 @@
 %% Copyright (C) 2016 Lagu
 %% Copyright (C) 2016 Mike Miller
-%% Copyright (C) 2016, 2019 Colin B. Macdonald
+%% Copyright (C) 2016, 2019, 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -31,9 +31,8 @@
 %% @end group
 %% @end example
 %%
-%% Note as of SymPy 1.5, this function rounds toward even:
+%% Note that this symbolic function rounds toward even:
 %% @example
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% @group
 %% round ([sym(5)/2 sym(7)/2])
 %%   @result{} (sym) [2  4]  (1×2 matrix)

diff --git a/inst/@sym/ztrans.m b/inst/@sym/ztrans.m
@@ -1,4 +1,5 @@
 %% Copyright (C) 2022 Alex Vong
+%% Copyright (C) 2024 Colin B. Macdonald
 %%
 %% This file is part of OctSymPy.
 %%
@@ -49,7 +50,6 @@
 %% @group
 %% syms n
 %% f = n^2;
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (f)
 %%   @result{} (sym)
 %%       ⎧        1
@@ -78,7 +78,6 @@
 %% @example
 %% @group
 %% syms n z w
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (exp (n))
 %%   @result{} (sym)
 %%       ⎧     1             ℯ
@@ -96,7 +95,6 @@
 %%       ⎪ ‾‾‾
 %%       ⎪n = 0
 %%       ⎩
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (exp (z))
 %%   @result{} (sym)
 %%       ⎧     1             ℯ
@@ -114,7 +112,6 @@
 %%       ⎪ ‾‾‾
 %%       ⎪z = 0
 %%       ⎩
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (exp (n), w)
 %%   @result{} (sym)
 %%       ⎧     1             ℯ
@@ -141,7 +138,6 @@
 %% @example
 %% @group
 %% syms a n y
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (n * exp (y))
 %%   @result{} (sym)
 %%       ⎛⎧    1             1     ⎞
@@ -159,7 +155,6 @@
 %%       ⎜⎪ ╱                      ⎟
 %%       ⎜⎪ ‾‾‾                    ⎟
 %%       ⎝⎩n = 0                   ⎠
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (a * exp (y))
 %%   @result{} (sym)
 %%         ⎛⎧     1             ℯ     ⎞
@@ -187,7 +182,6 @@
 %% @group
 %% syms n m k c z w u v
 %% f = [n^2 exp(n); 1/factorial(k) kroneckerDelta(c)];
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (f, [n m; k c], [z w; u v])
 %%   @result{} (sym 2×2 matrix)
 %%       ⎡⎧        1                                              ⎤
@@ -212,7 +206,6 @@
 %%       ⎢             ─                                          ⎥
 %%       ⎢             u                                          ⎥
 %%       ⎣            ℯ                            1              ⎦
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (f, [n m; k c], z)
 %%   @result{} (sym 2×2 matrix)
 %%       ⎡⎧        1                                              ⎤
@@ -255,7 +248,6 @@
 %%        ╱
 %%        ‾‾‾
 %%       n = 0
-%% @c doctest: +SKIP_UNLESS(pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %% ztrans (heaviside (n - 3))
 %%   @result{} (sym)
 %%         ∞

diff --git a/inst/private/assert_have_python_and_sympy.m b/inst/private/assert_have_python_and_sympy.m
@@ -1,4 +1,4 @@
-%% Copyright (C) 2016-2019, 2022-2023 Colin B. Macdonald
+%% Copyright (C) 2016-2019, 2022-2024 Colin B. Macdonald
 %% Copyright (C) 2022 Alex Vong
 %%
 %% This file is part of OctSymPy.
@@ -27,7 +27,7 @@
 
 function assert_have_python_and_sympy (pyexec, verbose)
 
-  minsympyver = '1.4';
+  minsympyver = '1.5.1';
 
   if (nargin < 2)
     verbose = false;

diff --git a/inst/private/assert_pythonic_and_sympy.m b/inst/private/assert_pythonic_and_sympy.m
@@ -1,5 +1,5 @@
-%% Copyright (C) 2019, 2022 Colin B. Macdonald
-%% Copyright (C) 2022 Alex Vong
+%% Copyright (C) 2019, 2022, 2024 Colin B. Macdonald
+%% Copyright (C) 2022-2023 Alex Vong
 %%
 %% This file is part of OctSymPy.
 %%
@@ -27,7 +27,7 @@
 
 function assert_pythonic_and_sympy (verbose)
 
-  minsympyver = '1.4';
+  minsympyver = '1.5.1';
 
   if (nargin < 1)
     verbose = false;

diff --git a/inst/vpa.m b/inst/vpa.m
@@ -355,13 +355,9 @@
 %!warning <dangerous> vpa ('sqrt(2.0)');
 
 %!warning <dangerous>
-%! if (pycall_sympy__ ('return Version(spver) > Version("1.4")'))
 %! a = vpa('2**0.5');
 %! b = vpa(sqrt(sym(2)));
 %! assert (isequal (a, b))
-%! else
-%! warning('dangerous')  % fake it until we drop 1.4
-%! end
 
 %!test
 %! a = vpa('2.3e1');