From c37860a8b5f2d297ac872cb6b4a716979253b4d1 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Wed, 8 Nov 2023 08:57:26 +0000 Subject: [PATCH 01/11] symengine 0.11.1 --- build/pkgs/symengine/checksums.ini | 6 +++--- build/pkgs/symengine/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini index 1c1813e7eea..8eb65f05ef9 100644 --- a/build/pkgs/symengine/checksums.ini +++ b/build/pkgs/symengine/checksums.ini @@ -1,5 +1,5 @@ tarball=symengine-VERSION.tar.gz -sha1=11885879ddcd0a9ab69e36a79b93aef836d6c95d -md5=4673c85b423241ce85a9df35a7ed61bb -cksum=1344562381 +sha1=a2c8957f2099c9199751b165f107bf93d6823818 +md5=fe3c3fee1bd8dfdb9576fc2d28cb1076 +cksum=3544211225 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz diff --git a/build/pkgs/symengine/package-version.txt b/build/pkgs/symengine/package-version.txt index 571215736a6..af88ba82486 100644 --- a/build/pkgs/symengine/package-version.txt +++ b/build/pkgs/symengine/package-version.txt @@ -1 +1 @@ -0.10.1 +0.11.1 From a14b0e54aff93c4ee3868cb73e6d001f39ef344a Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Wed, 8 Nov 2023 09:48:38 +0000 Subject: [PATCH 02/11] spkg-configure for symengine --- build/pkgs/symengine/spkg-configure.m4 | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 build/pkgs/symengine/spkg-configure.m4 diff --git a/build/pkgs/symengine/spkg-configure.m4 b/build/pkgs/symengine/spkg-configure.m4 new file mode 100644 index 00000000000..c037d2e5f72 --- /dev/null +++ b/build/pkgs/symengine/spkg-configure.m4 @@ -0,0 +1,45 @@ +SAGE_SPKG_CONFIGURE([symengine], [ + m4_pushdef(SAGE_SYMENGINE_VERSION_MAJOR, [0]) + m4_pushdef(SAGE_SYMENGINE_VERSION_MINOR, [11]) + SAGE_SPKG_DEPCHECK([gmp arb ecm flint mpc mpfr], [ + AC_CHECK_HEADER([symengine/symengine_config.h], [], [sage_spkg_install_symengine=yes]) + AC_MSG_CHECKING([whether we can link a program using symengine]) + SYMENGINE_SAVED_LIBS=$LIBS + LIBS="$LIBS -lsymengine" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[#include ]], + [[using SymEngine::Expression; + Expression x("x"); + auto ex = pow(x+sqrt(Expression(2)), 6);]] + )], [AC_MSG_RESULT([yes])], [ + AC_MSG_RESULT([no]); sage_spkg_install_symengine=yes + LIBS=$SYMENGINE_SAVED_LIBS + ]) + AC_MSG_CHECKING([symengine version >= ]SAGE_SYMENGINE_VERSION_MAJOR[.]SAGE_SYMENGINE_VERSION_MINOR) + AC_RUN_IFELSE([ + AC_LANG_PROGRAM( + [[#include + #include + ]], [[ + fprintf(stderr, "%s\n", SYMENGINE_VERSION); + if (SYMENGINE_MAJOR_VERSION >]] SAGE_SYMENGINE_VERSION_MAJOR[[) return 0; + else if (SYMENGINE_MAJOR_VERSION ==]] SAGE_SYMENGINE_VERSION_MAJOR[[ && + SYMENGINE_MINOR_VERSION >=]] SAGE_SYMENGINE_VERSION_MINOR[[) return 0; + else return 1; + ]])], [ + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + sage_spkg_install_symengine=yes + ], [ + dnl assume that the person running cross-compiling + dnl knows what they are doing + AC_MSG_RESULT([yes]) + ]) + ]) + + m4_popdef([SAGE_SYMENGINE_VERSION_MAJOR]) + m4_popdef([SAGE_SYMENGINE_VERSION_MINOR]) +], [], [], [] +) + From 4f3b94b383e3a542878dd58a3a6b5185f2ad2052 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Wed, 8 Nov 2023 10:09:05 +0000 Subject: [PATCH 03/11] data for symengine_py from the system --- build/pkgs/symengine_py/distros/gentoo.txt | 1 + build/pkgs/symengine_py/package-version.txt | 2 +- build/pkgs/symengine_py/spkg-configure.m4 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 build/pkgs/symengine_py/distros/gentoo.txt create mode 100644 build/pkgs/symengine_py/spkg-configure.m4 diff --git a/build/pkgs/symengine_py/distros/gentoo.txt b/build/pkgs/symengine_py/distros/gentoo.txt new file mode 100644 index 00000000000..e8851805aea --- /dev/null +++ b/build/pkgs/symengine_py/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/symengine diff --git a/build/pkgs/symengine_py/package-version.txt b/build/pkgs/symengine_py/package-version.txt index 78bc1abd14f..d9df1bbc0c7 100644 --- a/build/pkgs/symengine_py/package-version.txt +++ b/build/pkgs/symengine_py/package-version.txt @@ -1 +1 @@ -0.10.0 +0.11.0 diff --git a/build/pkgs/symengine_py/spkg-configure.m4 b/build/pkgs/symengine_py/spkg-configure.m4 new file mode 100644 index 00000000000..9559bdb6da0 --- /dev/null +++ b/build/pkgs/symengine_py/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([symengine_py], [SAGE_PYTHON_PACKAGE_CHECK([symengine_py])]) From fa52142b40aace10b3b75694cd2c2471a4c3e5e9 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 23 Nov 2023 12:40:07 +0000 Subject: [PATCH 04/11] symengine_py now on PyPI --- build/pkgs/symengine_py/checksums.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/symengine_py/checksums.ini b/build/pkgs/symengine_py/checksums.ini index 0235c5e9cd9..f8790fdfb4e 100644 --- a/build/pkgs/symengine_py/checksums.ini +++ b/build/pkgs/symengine_py/checksums.ini @@ -1,5 +1,5 @@ tarball=symengine.py-VERSION.tar.gz -sha1=fbbf052e66077ec51df319444b71f94114f33d9e -md5=fc5d2d7f571a880aa2e040214aed2ff0 -cksum=2535731241 -upstream_url=https://github.com/symengine/symengine.py/archive/vVERSION.tar.gz +sha1=4a8da0d0a057c8709c5b28543dbb3d26a060f013 +md5=d10f4ba5c27b09ef234fcafddf824ce5 +cksum=1332096394 +upstream_url=https://pypi.io/packages/source/p/symengine/symengine-VERSION.tar.gz From bcdb2096b413ceda28be4a5d1840c4a67dee356d Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 23 Nov 2023 13:14:03 +0000 Subject: [PATCH 05/11] features for symengine_py --- src/sage/features/symengine_py.py | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/sage/features/symengine_py.py diff --git a/src/sage/features/symengine_py.py b/src/sage/features/symengine_py.py new file mode 100644 index 00000000000..e708992782e --- /dev/null +++ b/src/sage/features/symengine_py.py @@ -0,0 +1,43 @@ +r""" +Check for symengine_py +""" + +# **************************************************************************** +# Copyright (C) 2023 Dima Pasechnik +# +# 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 Foundation, either version 2 of the License, or +# (at your option) any later version. +# https://www.gnu.org/licenses/ +# **************************************************************************** + +from . import PythonModule +from .join_feature import JoinFeature + + +class symengine_py(JoinFeature): + r""" + A :class:`sage.features.Feature` describing the presence of the + Python package :ref:`symengine_py `. + + EXAMPLES:: + + sage: from sage.features.igraph import symengine_py + sage: symengine_py().is_present() # optional - symengine_py + FeatureTestResult('symengine_py', True) + """ + def __init__(self): + r""" + TESTS:: + + sage: from sage.features.symengine_py import symengine_py + sage: isinstance(symengine_py(), symengine_py) + True + """ + JoinFeature.__init__(self, 'symengine_py', + [PythonModule('symengine', spkg="symengine_py", + url="https://pypi.org/project/symengine")]) + +def all_features(): + return [symengine_py()] From ec8e31d68e73937a59d3253712bf9d2737995c25 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Mon, 27 Nov 2023 11:51:41 +0000 Subject: [PATCH 06/11] more distro info for symengine(_py) --- build/pkgs/symengine/distros/arch.txt | 1 + build/pkgs/symengine/distros/homebrew.txt | 1 + build/pkgs/symengine_py/distros/arch.txt | 1 + build/pkgs/symengine_py/distros/freebsd.txt | 1 + 4 files changed, 4 insertions(+) create mode 100644 build/pkgs/symengine/distros/arch.txt create mode 100644 build/pkgs/symengine/distros/homebrew.txt create mode 100644 build/pkgs/symengine_py/distros/arch.txt create mode 100644 build/pkgs/symengine_py/distros/freebsd.txt diff --git a/build/pkgs/symengine/distros/arch.txt b/build/pkgs/symengine/distros/arch.txt new file mode 100644 index 00000000000..7bcf459b746 --- /dev/null +++ b/build/pkgs/symengine/distros/arch.txt @@ -0,0 +1 @@ +symengine diff --git a/build/pkgs/symengine/distros/homebrew.txt b/build/pkgs/symengine/distros/homebrew.txt new file mode 100644 index 00000000000..7bcf459b746 --- /dev/null +++ b/build/pkgs/symengine/distros/homebrew.txt @@ -0,0 +1 @@ +symengine diff --git a/build/pkgs/symengine_py/distros/arch.txt b/build/pkgs/symengine_py/distros/arch.txt new file mode 100644 index 00000000000..16ff7effe29 --- /dev/null +++ b/build/pkgs/symengine_py/distros/arch.txt @@ -0,0 +1 @@ +python-symengine diff --git a/build/pkgs/symengine_py/distros/freebsd.txt b/build/pkgs/symengine_py/distros/freebsd.txt new file mode 100644 index 00000000000..9fa30f46fb7 --- /dev/null +++ b/build/pkgs/symengine_py/distros/freebsd.txt @@ -0,0 +1 @@ +math/py-symengine From 5b1e73de6d047a68f5761b470328afe813bbc85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6ppe?= Date: Sun, 26 Nov 2023 19:29:17 -0800 Subject: [PATCH 07/11] Update src/sage/features/symengine_py.py Co-authored-by: Tobias Diez --- src/sage/features/symengine_py.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage/features/symengine_py.py b/src/sage/features/symengine_py.py index e708992782e..d32492085b7 100644 --- a/src/sage/features/symengine_py.py +++ b/src/sage/features/symengine_py.py @@ -23,7 +23,7 @@ class symengine_py(JoinFeature): EXAMPLES:: - sage: from sage.features.igraph import symengine_py + sage: from sage.features.symengine_py import symengine_py sage: symengine_py().is_present() # optional - symengine_py FeatureTestResult('symengine_py', True) """ From 0784108d476fd1a0a97188968d86e0ed554b166a Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Wed, 29 Nov 2023 01:31:37 +0000 Subject: [PATCH 08/11] promote symengine_py to optional --- build/pkgs/symengine_py/type | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/symengine_py/type b/build/pkgs/symengine_py/type index af4d63af86d..134d9bc32d5 100644 --- a/build/pkgs/symengine_py/type +++ b/build/pkgs/symengine_py/type @@ -1 +1 @@ -experimental \ No newline at end of file +optional From 917f7715cfa350814e5c0e1b1b23d65efcaec2b6 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Sat, 9 Dec 2023 23:10:28 +0000 Subject: [PATCH 09/11] update to 0.11.2 to support flint 3 --- build/pkgs/symengine/checksums.ini | 8 ++++---- build/pkgs/symengine/package-version.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini index 8eb65f05ef9..33fc310a65b 100644 --- a/build/pkgs/symengine/checksums.ini +++ b/build/pkgs/symengine/checksums.ini @@ -1,5 +1,5 @@ tarball=symengine-VERSION.tar.gz -sha1=a2c8957f2099c9199751b165f107bf93d6823818 -md5=fe3c3fee1bd8dfdb9576fc2d28cb1076 -cksum=3544211225 -upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz +sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f +md5=4074f3c76570bdc2ae9914edafa29eb6 +cksum=3782541135 +upstream_url=https://github.com/symengine/symengine/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/symengine/package-version.txt b/build/pkgs/symengine/package-version.txt index af88ba82486..bc859cbd6d9 100644 --- a/build/pkgs/symengine/package-version.txt +++ b/build/pkgs/symengine/package-version.txt @@ -1 +1 @@ -0.11.1 +0.11.2 From 1f97b5664074449f4e86822368053234b9cf234d Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Mon, 11 Dec 2023 14:12:24 +0000 Subject: [PATCH 10/11] switch back to a proper tarball --- build/pkgs/symengine/checksums.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini index 57cce47b098..9ba59940a9f 100644 --- a/build/pkgs/symengine/checksums.ini +++ b/build/pkgs/symengine/checksums.ini @@ -2,5 +2,5 @@ tarball=symengine-VERSION.tar.gz sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f md5=4074f3c76570bdc2ae9914edafa29eb6 cksum=3782541135 -upstream_url=https://github.com/symengine/symengine/archive/refs/tags/vVERSION.tar.gz +upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz From 8c141458f499e3fccdf9a52f15bfa2aade238d73 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 14 Dec 2023 11:59:03 -0800 Subject: [PATCH 11/11] build/pkgs/symengine/spkg-configure.m4: Remove arb --- build/pkgs/symengine/spkg-configure.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/symengine/spkg-configure.m4 b/build/pkgs/symengine/spkg-configure.m4 index c037d2e5f72..a6a78791dbc 100644 --- a/build/pkgs/symengine/spkg-configure.m4 +++ b/build/pkgs/symengine/spkg-configure.m4 @@ -1,7 +1,7 @@ SAGE_SPKG_CONFIGURE([symengine], [ m4_pushdef(SAGE_SYMENGINE_VERSION_MAJOR, [0]) m4_pushdef(SAGE_SYMENGINE_VERSION_MINOR, [11]) - SAGE_SPKG_DEPCHECK([gmp arb ecm flint mpc mpfr], [ + SAGE_SPKG_DEPCHECK([gmp ecm flint mpc mpfr], [ AC_CHECK_HEADER([symengine/symengine_config.h], [], [sage_spkg_install_symengine=yes]) AC_MSG_CHECKING([whether we can link a program using symengine]) SYMENGINE_SAVED_LIBS=$LIBS