Skip to content

Commit

Permalink
Merge pull request #1265 from gnu-octave/move_fallout
Browse files Browse the repository at this point in the history
Updates due to repo move
  • Loading branch information
cbm755 authored Jul 24, 2023
2 parents 0de10e1 + d6e64b9 commit 4533cb2
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
# "py.collections.Callable" to "py.collections.abc.Callable" and
# "py.collections.Sequence" to "py.collections.abc.Sequence"
# See also https://gitlab.com/gnu-octave/octave-pythonic/-/issues/95
# and https://github.com/cbm755/octsympy/issues/1067
# and https://github.com/gnu-octave/symbolic/issues/1067
docker exec oc find octave-pythonic -name '*.m' -execdir sed -i \
's/py\.collections\.Callable/py.collections.abc.Callable/g' \
'{}' ';'
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
octsympy 3.1.1+
===============

* Move repo to https://github.com/gnu-octave/symbolic
* Changed metainfo.xml ID and corrected long-standing "Addon"
link to GNU Octave.



Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Symbolic Package for GNU Octave

An implementation of a symbolic toolbox using SymPy.

[https://octave.sourceforge.io/symbolic]
https://octave.sourceforge.io/symbolic

https://github.com/gnu-octave/symbolic

<sub>Note: Development for most Octave packages tends to take place in sourceforge. However, unlike most other Octave packages, the main development repository for this package is on **github** (https://github.com/cbm755/octsympy), and only _mirrored_ on sourceforge (https://sourceforge.net/p/octave/symbolic/).
If you are thinking of contributing and you're looking at this README file from the sourceforge website, please consider visiting our github page and contributing there instead, as we do not tend to monitor sourceforge for activity.</sub>


Goals
Expand Down Expand Up @@ -58,7 +58,7 @@ How to Install on Windows

If you encounter any difficulties (even minor ones) please read and
if possible help us improve the
[wiki page on Windows Installation](https://github.com/cbm755/octsympy/wiki/Notes-on-Windows-installation).
[wiki page on Windows Installation](https://github.com/gnu-octave/symbolic/wiki/Notes-on-Windows-installation).



Expand All @@ -81,7 +81,7 @@ How to Help
-----------

We have a list of things to work on tagged [help
wanted](https://github.com/cbm755/octsympy/issues?q=is:open+is:issue+label:"help+wanted").
wanted](https://github.com/gnu-octave/symbolic/issues?q=is:open+is:issue+label:"help+wanted").
Some of these should be quite easy to fix and would be a great way to
get involved. Come join us!

Expand All @@ -90,7 +90,7 @@ How to hack on the code:
1. Clone the repo with git (preferred, but you can use the "Download
ZIP" instead if you want).

2. Run Octave in the `octsympy/inst/` directory. It should be safe
2. Run Octave in the `inst/` directory. It should be safe
to do this even if you have the released version of the package
installed (but not loaded).

Expand Down
8 changes: 4 additions & 4 deletions inst/@sym/coeffs.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2014-2017, 2019, 2022 Colin B. Macdonald
%% Copyright (C) 2014-2017, 2019, 2022-2023 Colin B. Macdonald
%%
%% This file is part of OctSymPy.
%%
Expand Down Expand Up @@ -101,7 +101,7 @@
%% @end group
%% @end example
%% @strong{Note:} The @qcode{'all'} feature does not yet work with
%% multivariate polynomials (https://github.com/cbm755/octsympy/issues/720).
%% multivariate polynomials (https://github.com/gnu-octave/symbolic/issues/720).
%%
%% @seealso{@@sym/sym2poly}
%% @end deftypemethod
Expand Down Expand Up @@ -248,13 +248,13 @@
%! assert (isequal (t, s))

%!error <multivariate polynomials not supported>
%! % TODO: multivariate all not working (https://github.com/cbm755/octsympy/issues/720)
%! % TODO: multivariate all not working (https://github.com/gnu-octave/symbolic/issues/720)
%! syms x y
%! [c, t] = coeffs(6*x^2 + 7*y + 19, [x y], 'all');

%!test
%! % empty same as not specifying; maybe not SMT compatible:
%! % https://github.com/cbm755/octsympy/pull/708#discussion_r94292831
%! % https://github.com/gnu-octave/symbolic/pull/708#discussion_r94292831
%! syms x y
%! [c, t] = coeffs(6*x*x + 27*y*x + 36, {});
%! a = [6 27 36];
Expand Down
4 changes: 2 additions & 2 deletions inst/@sym/function_handle.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2014-2019 Colin B. Macdonald
%% Copyright (C) 2014-2019, 2023 Colin B. Macdonald
%%
%% This file is part of OctSymPy.
%%
Expand Down Expand Up @@ -350,6 +350,6 @@
%! assert (h(1, 2, 3, 4) == 1000 + 20 + 300 + 4)

%!test
%! % https://github.com/cbm755/octsympy/issues/854
%! % https://github.com/gnu-octave/symbolic/issues/854
%! f = function_handle (x + 1i*sqrt (sym(3)));
%! assert (f (1), complex (1, sqrt (3)), -eps)
4 changes: 2 additions & 2 deletions inst/@sym/isinf.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2014, 2016 Colin B. Macdonald
%% Copyright (C) 2014, 2016, 2023 Colin B. Macdonald
%%
%% This file is part of OctSymPy.
%%
Expand Down Expand Up @@ -54,7 +54,7 @@
%% be infinite'' (as opposed to ``x is not infinite'').
%%
%% FIXME: this is behaviour might change in a future version; come
%% discuss at @url{https://github.com/cbm755/octsympy/issues/308}.
%% discuss at @url{https://github.com/gnu-octave/symbolic/issues/308}.
%%
%% @seealso{@@sym/isnan, @@sym/double}
%% @end defmethod
Expand Down
4 changes: 2 additions & 2 deletions inst/@sym/limit.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2014-2016, 2022 Colin B. Macdonald
%% Copyright (C) 2014-2016, 2022-2023 Colin B. Macdonald
%%
%% This file is part of OctSymPy.
%%
Expand Down Expand Up @@ -50,7 +50,7 @@
%% @code{limit(1/x, x, 0)}
%% (and @code{+/-inf} if you specify @code{left/right}). I'm not
%% sure how to get this nicer behaviour from SymPy.
%% FIXME: this is https://github.com/cbm755/octsympy/issues/74
%% FIXME: this is https://github.com/gnu-octave/symbolic/issues/74
%%
%% @seealso{@@sym/diff}
%% @end defmethod
Expand Down
2 changes: 1 addition & 1 deletion inst/assumptions.m
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,6 @@
%! assert (~isequal (n, sym(true)) && ~isequal (n, sym(false)))

%!test
%! %% TODO: rewrite later with https://github.com/cbm755/octsympy/issues/622
%! %% TODO: rewrite later with https://github.com/gnu-octave/symbolic/issues/622
%! a = pycall_sympy__ ('return Symbol("a", real=False)');
%! assert (strcmp (assumptions (a), {'a: ~real'}))
4 changes: 2 additions & 2 deletions inst/octsympy_tests.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2014, 2016-2017, 2019, 2022 Colin B. Macdonald
%% Copyright (C) 2014, 2016-2017, 2019, 2022-2023 Colin B. Macdonald
%%
%% This file is part of OctSymPy.
%%
Expand Down Expand Up @@ -28,7 +28,7 @@
%%
%% TODO: eventually we should drop this file altogether, and use
%% @code{pkg test symbolic} instead, see
%% @url{https://github.com/cbm755/octsympy/issues/1142}
%% @url{https://github.com/gnu-octave/symbolic/issues/1142}
%% and @url{https://savannah.gnu.org/bugs/?62681}.
%%
%% @seealso{test, runtests, doctest}
Expand Down
4 changes: 2 additions & 2 deletions inst/private/assert_have_python_and_sympy.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2016-2019, 2022 Colin B. Macdonald
%% Copyright (C) 2016-2019, 2022-2023 Colin B. Macdonald
%% Copyright (C) 2022 Alex Vong
%%
%% This file is part of OctSymPy.
Expand Down Expand Up @@ -83,7 +83,7 @@ function assert_have_python_and_sympy (pyexec, verbose)
% disp ('')
% disp (' * Did you install the Symbolic bundle for Windows that includes Python?')
% disp (' Please refer to the installation notes for Windows users at')
% disp (' <https://github.com/cbm755/octsympy/wiki/Notes-on-Windows-installation>')
% disp (' <https://github.com/gnu-octave/symbolic/wiki/Notes-on-Windows-installation>')
% end
return
end
Expand Down
6 changes: 3 additions & 3 deletions inst/private/python_copy_vars_to.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2014-2015 Colin B. Macdonald
%% Copyright (C) 2014-2017, 2023 Colin B. Macdonald
%%
%% This file is part of OctSymPy.
%%
Expand Down Expand Up @@ -128,8 +128,8 @@
% What should we do with double arrays? Perhaps map them to numpy
% arrays is the most useful in general. For now, we map them to a
% list-of-lists. This could change in the future. See also:
% https://github.com/cbm755/octsympy/issues/134
% https://github.com/cbm755/octsympy/pull/336
% https://github.com/gnu-octave/symbolic/issues/134
% https://github.com/gnu-octave/symbolic/pull/336
c=c+1; a{c} = sprintf('%s%s.append(%s)', sp, in, sprintf(octave_array_to_python(x)));

else
Expand Down
4 changes: 2 additions & 2 deletions inst/private/python_header.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2014-2017, 2019, 2021-2022 Colin B. Macdonald
# Copyright (C) 2014-2017, 2019, 2021-2023 Colin B. Macdonald
# Copyright (C) 2019 Mike Miller
# Copyright (C) 2020 Tianyu Chen (billchenchina)
# Copyright (C) 2021 Johannes Maria Frank
Expand Down Expand Up @@ -43,7 +43,7 @@ def echo_exception_stdout(mystr):
# for sets
from sympy.utilities.iterables import uniq
try:
# quick fix for https://github.com/cbm755/octsympy/issues/1053
# quick fix for https://github.com/gnu-octave/symbolic/issues/1053
# TODO: investigate the sym ctor in this case, likely a better fix in there
from sympy.core.symbol import Str
except ImportError:
Expand Down
4 changes: 2 additions & 2 deletions inst/private/python_ipc_native.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2016, 2018-2019 Colin B. Macdonald
%% Copyright (C) 2016, 2018-2019, 2023 Colin B. Macdonald
%% Copyright (C) 2016 Abhinav Tripathi
%% Copyright (C) 2021 Johannes Maria Frank
%% Copyright (C) 2022 Chris Gorman
Expand Down Expand Up @@ -78,7 +78,7 @@
'# for sets'
'from sympy.utilities.iterables import uniq'
'try:'
' # quick fix for https://github.com/cbm755/octsympy/issues/1053'
' # quick fix for https://github.com/gnu-octave/symbolic/issues/1053'
' # TODO: investigate the sym ctor in this case, likely a better fix in there'
' from sympy.core.symbol import Str'
'except ImportError:'
Expand Down
4 changes: 2 additions & 2 deletions inst/pycall_sympy__.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%% Copyright (C) 2014-2019, 2022 Colin B. Macdonald
%% Copyright (C) 2014-2019, 2022-2023 Colin B. Macdonald
%% Copyright (C) 2022 Alex Vong
%%
%% This file is part of OctSymPy.
Expand Down Expand Up @@ -187,7 +187,7 @@
else
what_to_do = ['Try "sympref reset" and repeat your command?\n' ...
' (consider filing an issue at ' ...
'https://github.com/cbm755/octsympy/issues)'];
'https://github.com/gnu-octave/symbolic/issues)'];
end
error ('Python exception: %s\n occurred %s.\n %s', ...
A{3}, A{2}, sprintf (what_to_do))
Expand Down

0 comments on commit 4533cb2

Please sign in to comment.