sagemath · mkoeppe · Jun 21, 2023 · Jun 20, 2023 · Oct 8, 2023 · Oct 8, 2023
diff --git a/.gitignore b/.gitignore
@@ -168,6 +168,9 @@ __pycache__/
 build/temp.*/
 build/bin/sage-build-env-config
 
+# Vendored on sdist/install
+/src/sage/libs/mpmath/_vendor/mpmath*
+
 # Generated files in the top-level source trees
 /pkgs/*/build
 /pkgs/*/dist
@@ -195,6 +198,7 @@ build/bin/sage-build-env-config
 /pkgs/sagemath-categories/setup.cfg
 /pkgs/sagemath-environment/setup.cfg
 /pkgs/sagemath-repl/setup.cfg
+/pkgs/sagemath-mpmath/setup.cfg
 /pkgs/sagemath-objects/pyproject.toml
 /pkgs/sagemath-bliss/pyproject.toml
 /pkgs/sagemath-coxeter3/pyproject.toml
@@ -205,6 +209,7 @@ build/bin/sage-build-env-config
 /pkgs/sagemath-categories/pyproject.toml
 /pkgs/sagemath-environment/pyproject.toml
 /pkgs/sagemath-repl/pyproject.toml
+/pkgs/sagemath-mpmath/pyproject.toml
 /pkgs/sagemath-objects/requirements.txt
 /pkgs/sagemath-bliss/requirements.txt
 /pkgs/sagemath-coxeter3/requirements.txt
@@ -215,8 +220,11 @@ build/bin/sage-build-env-config
 /pkgs/sagemath-categories/requirements.txt
 /pkgs/sagemath-environment/requirements.txt
 /pkgs/sagemath-repl/requirements.txt
+/pkgs/sagemath-mpmath/requirements.txt
 /pkgs/sagemath-categories/MANIFEST.in
 
+/pkgs/sagemath-mpmath/vendor.txt
+
 # same for old locations - before Issue #31577
 /build/pkgs/*/src/build
 /build/pkgs/*/src/dist

diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -141,7 +141,8 @@ PYPI_WHEEL_PACKAGES =				\
 	sagemath_tdlib				\
 	sagemath_coxeter3 			\
 	sagemath_sirocco			\
-	sagemath_meataxe
+	sagemath_meataxe			\
+	sagemath_mpmath
 
 # sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
 WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES)		\

diff --git a/build/pkgs/click/SPKG.rst b/build/pkgs/click/SPKG.rst
@@ -0,0 +1,18 @@
+click: Composable command line interface toolkit
+================================================
+
+Description
+-----------
+
+Composable command line interface toolkit
+
+License
+-------
+
+BSD-3-Clause
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/click/
+
diff --git a/build/pkgs/click/checksums.ini b/build/pkgs/click/checksums.ini
@@ -0,0 +1,5 @@
+tarball=click-VERSION-py3-none-any.whl
+sha1=d066d29afdc61b0ba89ff9a58803fce84d47682b
+md5=37a41134cc8a13400234746942d5d180
+cksum=437758716
+upstream_url=https://pypi.io/packages/py3/c/click/click-VERSION-py3-none-any.whl
diff --git a/build/pkgs/click/dependencies b/build/pkgs/click/dependencies
@@ -0,0 +1,4 @@
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/click/install-requires.txt b/build/pkgs/click/install-requires.txt
@@ -0,0 +1 @@
+click
diff --git a/build/pkgs/click/package-version.txt b/build/pkgs/click/package-version.txt
@@ -0,0 +1 @@
+8.1.7
diff --git a/build/pkgs/click/type b/build/pkgs/click/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/markdown_it_py/SPKG.rst b/build/pkgs/markdown_it_py/SPKG.rst
@@ -0,0 +1,16 @@
+markdown_it_py: Python port of markdown-it. Markdown parsing, done right!
+=========================================================================
+
+Description
+-----------
+
+Python port of markdown-it. Markdown parsing, done right!
+
+License
+-------
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/markdown-it-py/
+
diff --git a/build/pkgs/markdown_it_py/checksums.ini b/build/pkgs/markdown_it_py/checksums.ini
@@ -0,0 +1,5 @@
+tarball=markdown_it_py-VERSION-py3-none-any.whl
+sha1=3982b43b7efd8f976d0d89f7ea110a7db73194c4
+md5=261d52f83b11ca9280c84c7692de7c9d
+cksum=1940511663
+upstream_url=https://pypi.io/packages/py3/m/markdown_it_py/markdown_it_py-VERSION-py3-none-any.whl
diff --git a/build/pkgs/markdown_it_py/dependencies b/build/pkgs/markdown_it_py/dependencies
@@ -0,0 +1,4 @@
+mdurl | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/markdown_it_py/install-requires.txt b/build/pkgs/markdown_it_py/install-requires.txt
@@ -0,0 +1 @@
+markdown-it-py
diff --git a/build/pkgs/markdown_it_py/package-version.txt b/build/pkgs/markdown_it_py/package-version.txt
@@ -0,0 +1 @@
+3.0.0
diff --git a/build/pkgs/markdown_it_py/type b/build/pkgs/markdown_it_py/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/mdurl/SPKG.rst b/build/pkgs/mdurl/SPKG.rst
@@ -0,0 +1,16 @@
+mdurl: Markdown URL utilities
+=============================
+
+Description
+-----------
+
+Markdown URL utilities
+
+License
+-------
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/mdurl/
+
diff --git a/build/pkgs/mdurl/checksums.ini b/build/pkgs/mdurl/checksums.ini
@@ -0,0 +1,5 @@
+tarball=mdurl-VERSION-py3-none-any.whl
+sha1=a26cf93cb2fe37f85fee4ea2f1c372cde26dd8b9
+md5=7db14dc5d739bfca141f035953620659
+cksum=1224661636
+upstream_url=https://pypi.io/packages/py3/m/mdurl/mdurl-VERSION-py3-none-any.whl
diff --git a/build/pkgs/mdurl/dependencies b/build/pkgs/mdurl/dependencies
@@ -0,0 +1,4 @@
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/mdurl/install-requires.txt b/build/pkgs/mdurl/install-requires.txt
@@ -0,0 +1 @@
+mdurl
diff --git a/build/pkgs/mdurl/package-version.txt b/build/pkgs/mdurl/package-version.txt
@@ -0,0 +1 @@
+0.1.2
diff --git a/build/pkgs/mdurl/type b/build/pkgs/mdurl/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/rich/SPKG.rst b/build/pkgs/rich/SPKG.rst
@@ -0,0 +1,18 @@
+rich: Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal
+=====================================================================================================
+
+Description
+-----------
+
+Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/rich/
+
diff --git a/build/pkgs/rich/checksums.ini b/build/pkgs/rich/checksums.ini
@@ -0,0 +1,5 @@
+tarball=rich-VERSION-py3-none-any.whl
+sha1=93aa7984e7e7524718bfb541cc2dc42809c5cd8d
+md5=a8d2aa27ea73def9c1091c64a34746bc
+cksum=2586776835
+upstream_url=https://pypi.io/packages/py3/r/rich/rich-VERSION-py3-none-any.whl
diff --git a/build/pkgs/rich/dependencies b/build/pkgs/rich/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) markdown_it_py | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/rich/install-requires.txt b/build/pkgs/rich/install-requires.txt
@@ -0,0 +1 @@
+rich
diff --git a/build/pkgs/rich/package-version.txt b/build/pkgs/rich/package-version.txt
@@ -0,0 +1 @@
+13.6.0
diff --git a/build/pkgs/rich/type b/build/pkgs/rich/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies
@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf sagemath_mpmath singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/sagelib/spkg-install b/build/pkgs/sagelib/spkg-install
@@ -62,7 +62,7 @@ if [ "$SAGE_EDITABLE" = yes ]; then
     # under the old distribution name "sage" (before #30912, which switched to setuptools
     # and renamed the distribution to "sagemath-standard").  There is no clean way to uninstall
     # them, so we just use rm.
-    (cd "$SITEPACKAGESDIR" && rm -rf sage sage-[1-9]*.egg-info sage-[1-9]*.dist-info)
+    (cd "$SITEPACKAGESDIR" && rm -rf sage/__init__.py sage-[1-9]*.egg-info sage-[1-9]*.dist-info)
     time sdh_pip_editable_install .
 
     if [ "$SAGE_WHEELS" = yes ]; then

diff --git a/build/pkgs/sagemath_mpmath/SPKG.rst b/build/pkgs/sagemath_mpmath/SPKG.rst
@@ -0,0 +1 @@
+src/README.rst
diff --git a/build/pkgs/sagemath_mpmath/bootstrap b/build/pkgs/sagemath_mpmath/bootstrap
@@ -0,0 +1 @@
+../sagelib/bootstrap
diff --git a/build/pkgs/sagemath_mpmath/dependencies b/build/pkgs/sagemath_mpmath/dependencies
@@ -0,0 +1 @@
+$(PYTHON) cysignals mpmath | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig vendoring
diff --git a/build/pkgs/sagemath_mpmath/install-requires.txt b/build/pkgs/sagemath_mpmath/install-requires.txt
@@ -0,0 +1,2 @@
+# This file is updated on every release by the sage-update-version script
+sagemath-mpmath
diff --git a/build/pkgs/sagemath_mpmath/package-version.txt b/build/pkgs/sagemath_mpmath/package-version.txt
@@ -0,0 +1 @@
+src/VERSION.txt
diff --git a/build/pkgs/sagemath_mpmath/spkg-install b/build/pkgs/sagemath_mpmath/spkg-install
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# From sage-spkg.
+# For type=script packages, the build rule in build/make/Makefile sources
+# sage-env but not sage-dist-helpers.
+lib="$SAGE_ROOT/build/bin/sage-dist-helpers"
+source "$lib"
+if [ $? -ne 0 ]; then
+    echo >&2 "Error: failed to source $lib"
+    echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?"
+    exit 1
+fi
+cd src
+
+rm -rf build *.egg_info
+
+export PIP_NO_INDEX=true
+export PIP_FIND_LINKS="file://$SAGE_DISTFILES"
+vendoring sync || sdh_die "Vendoring failed"
+
+export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS"
+
+# The metadata are set up to use the modularized distributions as dependencies.
+# Hence here we install with --no-build-isolation --no-deps
+sdh_pip_install --no-build-isolation --no-deps .
diff --git a/build/pkgs/sagemath_mpmath/spkg-src b/build/pkgs/sagemath_mpmath/spkg-src
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# Script to prepare an sdist tarball for sagemath-mpmath
+# This script is not used during build.
+#
+# HOW TO MAKE THE TARBALL:
+# ./sage --sh build/pkgs/sagemath_mpmath/spkg-src
+
+if [ -z "$SAGE_ROOT" ] ; then
+    echo >&2 "Error - SAGE_ROOT undefined ... exiting"
+    echo >&2 "Maybe run 'sage -sh'?"
+    exit 1
+fi
+
+# Exit on failure
+set -e
+
+cd build/pkgs/sagemath_mpmath
+
+cd src
+# Get rid of old *.egg-info/SOURCES.txt
+rm -Rf *.egg-info
+
+python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES"
diff --git a/build/pkgs/sagemath_mpmath/src b/build/pkgs/sagemath_mpmath/src
@@ -0,0 +1 @@
+../../../pkgs/sagemath-mpmath
diff --git a/build/pkgs/sagemath_mpmath/type b/build/pkgs/sagemath_mpmath/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/toml/SPKG.rst b/build/pkgs/toml/SPKG.rst
@@ -0,0 +1,18 @@
+toml: Python Library for Tom's Obvious, Minimal Language
+========================================================
+
+Description
+-----------
+
+Python Library for Tom's Obvious, Minimal Language
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/toml/
+
diff --git a/build/pkgs/toml/checksums.ini b/build/pkgs/toml/checksums.ini
@@ -0,0 +1,5 @@
+tarball=toml-VERSION-py2.py3-none-any.whl
+sha1=a55ae166e643e6c7a28c16fe005efc32ee98ee76
+md5=dc26cd71b80d6757139f38156a43c545
+cksum=1596064333
+upstream_url=https://pypi.io/packages/py2.py3/t/toml/toml-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/toml/dependencies b/build/pkgs/toml/dependencies
@@ -0,0 +1,4 @@
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/toml/distros/arch.txt b/build/pkgs/toml/distros/arch.txt
@@ -0,0 +1 @@
+python-toml
diff --git a/build/pkgs/toml/distros/debian.txt b/build/pkgs/toml/distros/debian.txt
@@ -0,0 +1 @@
+python3-toml
diff --git a/build/pkgs/toml/distros/fedora.txt b/build/pkgs/toml/distros/fedora.txt
@@ -0,0 +1 @@
+python-toml
diff --git a/build/pkgs/toml/distros/gentoo.txt b/build/pkgs/toml/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/toml
diff --git a/build/pkgs/toml/distros/opensuse.txt b/build/pkgs/toml/distros/opensuse.txt
@@ -0,0 +1 @@
+python3${PYTHON_MINOR}-toml
diff --git a/build/pkgs/toml/install-requires.txt b/build/pkgs/toml/install-requires.txt
@@ -0,0 +1 @@
+toml
diff --git a/build/pkgs/toml/package-version.txt b/build/pkgs/toml/package-version.txt
@@ -0,0 +1 @@
+0.10.2
diff --git a/build/pkgs/toml/type b/build/pkgs/toml/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/vendoring/SPKG.rst b/build/pkgs/vendoring/SPKG.rst
@@ -0,0 +1,16 @@
+vendoring: A command line tool, to simplify vendoring pure Python dependencies.
+===============================================================================
+
+Description
+-----------
+
+A command line tool, to simplify vendoring pure Python dependencies.
+
+License
+-------
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/vendoring/
+
diff --git a/build/pkgs/vendoring/checksums.ini b/build/pkgs/vendoring/checksums.ini
@@ -0,0 +1,5 @@
+tarball=vendoring-VERSION-py2.py3-none-any.whl
+sha1=583c5cbf3fd512f4f683afbea7d60f7e3234c3ac
+md5=a97f7f74700be564a9f8ad1fa33b5e1f
+cksum=2501073473
+upstream_url=https://pypi.io/packages/py2.py3/v/vendoring/vendoring-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/vendoring/dependencies b/build/pkgs/vendoring/dependencies
@@ -0,0 +1,4 @@
+rich click toml | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/vendoring/install-requires.txt b/build/pkgs/vendoring/install-requires.txt
@@ -0,0 +1 @@
+vendoring
diff --git a/build/pkgs/vendoring/package-version.txt b/build/pkgs/vendoring/package-version.txt
@@ -0,0 +1 @@
+1.2.0
diff --git a/build/pkgs/vendoring/type b/build/pkgs/vendoring/type
@@ -0,0 +1 @@
+standard
diff --git a/pkgs/sagemath-mpmath/MANIFEST.in b/pkgs/sagemath-mpmath/MANIFEST.in
@@ -0,0 +1,25 @@
+prune sage
+
+include VERSION.txt
+include vendor.txt
+
+include sage/libs/mpfr/*.pxd            # FIXME
+include sage/rings/real_mpfr.pxd        # FIXME
+include sage/rings/complex_mpfr.pxd        # FIXME
+
+graft sage/libs/mpmath
+
+global-exclude *.c
+global-exclude *.cpp
+
+global-exclude all__sagemath*.py
+global-include all__sagemath_mpmath.py
+
+global-exclude __pycache__
+global-exclude *.py[co]
+global-exclude *.bak
+global-exclude *.so
+global-exclude *~
+prune .tox
+prune build
+prune dist
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		$(PYTHON) cysignals mpmath \| $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig vendoring
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# This file is updated on every release by the sage-update-version script
		sagemath-mpmath