Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: add tests on Sympy 1.13.3 #1314

Merged
merged 9 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions inst/@double/bernoulli.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions inst/@double/chebyshevT.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions inst/@double/chebyshevU.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions inst/@double/coshint.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions inst/@double/cosint.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions inst/@double/fresnelc.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions inst/@double/fresnels.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/and.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion inst/@sym/bernoulli.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/coeffs.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
5 changes: 3 additions & 2 deletions inst/@sym/dilog.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions inst/@sym/double.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/eq.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 2 additions & 4 deletions inst/@sym/eval.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/ezmesh.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/ezplot3.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/ezsurf.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/fourier.m
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions inst/@sym/fplot.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/function_handle.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
5 changes: 2 additions & 3 deletions inst/@sym/gammainc.m
Original file line number Diff line number Diff line change
@@ -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.
%%
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/horzcat.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/ifourier.m
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/ilaplace.m
Original file line number Diff line number Diff line change
@@ -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
%%
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/isAlways.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/laplace.m
Original file line number Diff line number Diff line change
@@ -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
%%
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/logical.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/private/mat_rclist_asgn.m
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions inst/@sym/subs.m
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion inst/@sym/sym.m
Original file line number Diff line number Diff line change
@@ -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
%%
Expand Down
Loading