Skip to content

Commit

Permalink
Trac #30063: Upgrade Maxima to 5.44.0
Browse files Browse the repository at this point in the history
Upstream tarball: see `upstream_url` in `checksums.ini`.

Previous update: #26625 Update maxima to 5.42.2

URL: https://trac.sagemath.org/30063
Reported by: pbruin
Ticket author(s): Matthias Koeppe, Thierry Monteil
Reviewer(s): Emmanuel Charpentier, Matthias Koeppe
  • Loading branch information
Release Manager committed Aug 20, 2020
2 parents 044f488 + 21e2fea commit 611a2d6
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 124 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=9cc96f867a972260fba31ec0f94d93a83c8f0171
md5=bb139207e7cfd88b73d0ac13e2888b5a
cksum=1509944110
sha1=0e54fe11e7b0b193954641aa0af809c71f71ac65
md5=74b873bb1f8003003ad3d57249a0eba1
cksum=981384134
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
842a6866f12dc8ed96cc9f10f828c872dfb8e73a
d6e0952447e576f0ad9e7641584e79cd31c7e172
7 changes: 4 additions & 3 deletions build/pkgs/maxima/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tarball=maxima-VERSION.tar.gz
sha1=ddb2f1405ccb2c4f2bd6712755e2dbbd9a2e57e0
md5=b66bf80a95e7e78d68e5f230e7b94761
cksum=1645453342
sha1=5f1fce915675f46823c33638480dcc1fcaf447a1
md5=75e040745161901968d9c99c7a258e5c
cksum=2316004676
upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download
2 changes: 1 addition & 1 deletion build/pkgs/maxima/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.42.2
5.44.0

This file was deleted.

19 changes: 0 additions & 19 deletions build/pkgs/maxima/patches/bugfix3629.patch

This file was deleted.

9 changes: 9 additions & 0 deletions build/pkgs/maxima/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ for i in doc/info/*.html ; do
touch "${i}"
done
touch doc/info/maxima.info*
# Maxima 5.44.0 build_html.sh is not compatible with makeinfo 4.8
# (which is /usr/bin/makeinfo on macOS). #30063
# Do not build the HTML docs unless the user asks for it,
# in which case it is their problem to install a better
# makeinfo version.
if [[ "$SAGE_SPKG_INSTALL_DOCS" != yes ]] ; then
touch doc/info/maxima_toc.html interfaces/xmaxima/doc/xmaxima.html
fi

#---------------------------------------------------------------

sdh_make
Expand Down
4 changes: 2 additions & 2 deletions src/sage/functions/gamma.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,14 +509,14 @@ def __init__(self):
sage: gamma_inc_lower(x,x)._sympy_()
lowergamma(x, x)
sage: maxima(gamma_inc_lower(x,x))
gamma_greek(_SAGE_VAR_x,_SAGE_VAR_x)
gamma_incomplete_lower(_SAGE_VAR_x,_SAGE_VAR_x)
.. SEEALSO::
:class:`Function_gamma_inc`
"""
BuiltinFunction.__init__(self, "gamma_inc_lower", nargs=2, latex_name=r"\gamma",
conversions={'maxima':'gamma_greek',
conversions={'maxima':'gamma_incomplete_lower',
'maple':'GAMMA', 'sympy':'lowergamma', 'giac':'igamma'})

def _eval_(self, x, y):
Expand Down
22 changes: 16 additions & 6 deletions src/sage/interfaces/maxima_abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,14 @@ def _command_runner(self, command, s, redirect=True):
if redirect:
res = bytes_to_str(subprocess.check_output(cmd, shell=True,
env=env))
# We get 4 lines of commented verbosity every time Maxima starts
# and the input is echoed, so we need to get rid of them
for _ in range(5):
res = res[res.find('\n')+1:]
# We get a few lines of commented verbosity every time Maxima starts
while res.startswith(';;;'):
newline = res.find('\n')
if newline == -1:
break
res = res[newline + 1:]
# The input is echoed, so we need to get rid of it
res = res[res.find('\n')+1:]

return AsciiArtString(res)
else:
Expand Down Expand Up @@ -289,8 +293,14 @@ def completions(self, s, verbose=True):
# in Maxima 5.19.1, apropos returns all commands that contain
# the given string, instead of all commands that start with
# the given string
cmd_list = self._eval_line('apropos("%s")'%s, error_check=False).replace('\\ - ','-')
cmd_list = [x for x in cmd_list[1:-1].split(',') if x[0] != '?']
#
# Maxima 5.44 changed DEFMFUN so that it creates both $NAME
# and $NAME-IMPL (although the documentation suggests it would
# create NAME-IMPL, without the leading $). This causes
# name-impl to show up in $APROPOS. We remove it.
# https://sourceforge.net/p/maxima/bugs/3643/
cmd_list = self._eval_line('apropos("%s")'%s, error_check=False).replace('\\ - ','-').replace('\\-','-')
cmd_list = [x for x in cmd_list[1:-1].split(',') if x[0] != '?' and not x.endswith('-impl')]
return [x for x in cmd_list if x.find(s) == 0]

def _commands(self, verbose=True):
Expand Down
2 changes: 1 addition & 1 deletion src/sage/symbolic/expression.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -10109,7 +10109,7 @@ cdef class Expression(CommutativeRingElement):
....: .simplify_hypergeometric(algorithm='sage'))
hypergeometric((hypergeometric((e^x,), (1,), x),), (1,), x)
sage: hypergeometric_M(1, 3, x).simplify_hypergeometric()
-2*(x - e^x + 1)/x^2
-2*((x + 1)*e^(-x) - 1)*e^x/x^2
sage: (2 * hypergeometric_U(1, 3, x)).simplify_hypergeometric()
2*(x + 1)/x^2
Expand Down
6 changes: 3 additions & 3 deletions src/sage/symbolic/integration/integral.py
Original file line number Diff line number Diff line change
Expand Up @@ -859,11 +859,11 @@ def integrate(expression, v=None, a=None, b=None, algorithm=None, hold=False):
sage: integrate(cos(w+T) / (1+c*cos(T))^2, T, 0, 2*pi)
2*pi*sqrt(-c^2 + 1)*c*cos(w)/(c^4 - 2*c^2 + 1)
Check that :trac:`13733` is fixed::
Check that :trac:`13733` is fixed (but the bug reappeared, see :trac:`30063`)::
sage: a = integral(log(cot(x) - 1), x, 0, pi/4); a # long time (about 6 s)
sage: a = integral(log(cot(x) - 1), x, 0, pi/4); a # long time (about 6 s) # known bug
-1/4*pi*log(2) - 1/2*I*dilog(I + 1) + 1/2*I*dilog(-I + 1) + 1/2*I*dilog(1/2*I + 1/2) - 1/2*I*dilog(-1/2*I + 1/2)
sage: abs(N(a - pi*log(2)/8)) < 1e-15 # long time
sage: abs(N(a - pi*log(2)/8)) < 1e-15 # long time # known bug
True
Check that :trac:`17968` is fixed::
Expand Down

0 comments on commit 611a2d6

Please sign in to comment.