Merge tag '9.7.beta4' into t/34110/numpy_1_23

SageMath version 9.7.beta4, Release Date: 2022-07-07

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.7.beta3", 
-    "version": "9.7.beta3", 
+    "title": "sagemath/sage: 9.7.beta4", 
+    "version": "9.7.beta4", 
     "upload_type": "software", 
-    "publication_date": "2022-06-19", 
+    "publication_date": "2022-07-07", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.7.beta3", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.7.beta4", 
             "relation": "isSupplementTo"
         }, 
         {

Makefile

@@ -190,7 +190,7 @@ micro_release:
 	$(MAKE) sagelib-clean
 	$(MAKE) misc-clean
 	@echo "Stripping binaries ..."
-	LC_ALL=C find local/lib local/bin -type f -exec strip '{}' ';' 2>&1 | grep -v "File format not recognized" |  grep -v "File truncated" || true
+	LC_ALL=C find local/lib local/bin local/var/lib/sage/venv-python* -type f -exec strip '{}' ';' 2>&1 | grep -v "File format not recognized" |  grep -v "File truncated" || true
 	@echo "Removing sphinx artifacts..."
 	rm -rf local/share/doc/sage/doctrees local/share/doc/sage/inventory
 	@echo "Removing documentation. Inspection in IPython still works."

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.7.beta3, Release Date: 2022-06-19
+SageMath version 9.7.beta4, Release Date: 2022-07-07

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=b6a462ba966439bb0cbd460d2bd1cb02d3343fba
-md5=95d6ce767184d6ee956feaf65494b4e8
-cksum=2637324690
+sha1=67951dc1862f7e26d17b1f1021a6dce84dd04724
+md5=7e38c980aaf6795906917f7925c61154
+cksum=2189559877

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-b466c8ae02c04d287d28d2d669e1d111df3724ff
+232d0434cfdbac94665d3a1ef2a4eed47e272efb

build/pkgs/cryptominisat/checksums.ini

@@ -1,4 +1,5 @@
 tarball=cryptominisat-VERSION.tar.gz
-sha1=db418f5ac124e8d4e1f5284f05bccbe5b61afed9
-md5=ca1bf853e568c19968daa5464ab86843
-cksum=4204324235
+sha1=f79dfa1ffc6c9c75b3a33f76d3a89a3df2b3f4c2
+md5=05bdde77aa78c983849437e93b39bd6a
+cksum=462131608
+upstream_url=https://github.com/msoos/cryptominisat/archive/refs/tags/VERSION.tar.gz

build/pkgs/cryptominisat/package-version.txt

@@ -1 +1 @@
-5.6.8
+5.8.0

build/pkgs/cryptominisat/patches/679.patch

@@ -0,0 +1,43 @@
+From a01179ffd6b0dd47bfdef2d9350d80b575571f24 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
+Date: Sun, 3 Apr 2022 20:02:59 +0200
+Subject: [PATCH] python/setup.py.in: import sysconfig instead of importing it
+ from distutils
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+setuptools 61 dropped sysconfig module
+
+Ref: https://github.com/stamparm/pcapy-ng/commit/f6ce5248f78ac0a247d76e48cff152f4e3f26482
+Bug: https://bugs.gentoo.org/836684
+
+Signed-off-by: Maciej Barć <xgqt@gentoo.org>
+---
+ python/setup.py.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/python/setup.py.in b/python/setup.py.in
+index b3ab64af4..293eb1f80 100644
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -27,7 +27,7 @@ import sys
+ import os
+ import platform
+ from distutils.core import setup, Extension
+-from distutils import sysconfig
++import sysconfig
+ from distutils.cmd import Command
+
+ __PACKAGE_VERSION__ = "0.2.0"
+@@ -59,8 +59,8 @@ def _init_posix(init):
+     Forces g++ instead of gcc on most systems
+     credits to eric jones (eric@enthought.com) (found at Google Groups)
+     """
+-    def wrapper():
+-        init()
++    def wrapper(vars):
++        init(vars)
+
+         config_vars = sysconfig.get_config_vars()  # by reference
+         if config_vars["MACHDEP"].startswith("sun"):

build/pkgs/cryptominisat/patches/cryptominisat-5.8.0-rm_extra_python_vars.patch

@@ -0,0 +1,37 @@
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index f549ca7..4a9f0d8 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -25,19 +25,6 @@ import sysconfig;
+ print(sysconfig.get_config_var('CFLAGS'), end = '')"
+     OUTPUT_VARIABLE PY_C_CONFIG)
+
+-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+-from __future__ import print_function;
+-import sysconfig;
+-print(sysconfig.get_config_var('SHLIBS'), end = '')"
+-    OUTPUT_VARIABLE PY_LD_CONFIG)
+-
+-
+-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+-from __future__ import print_function;
+-import sysconfig;
+-print(sysconfig.get_config_var('LINKFORSHARED'), end = '')"
+-    OUTPUT_VARIABLE PY_LINKFORSHARED_CONFIG)
+-
+ if(DEFINED ENV{PYCRYPTOSAT_INSTALL_PATH})
+     set(PY_INSTALL_PREFIX "--prefix=$ENV{PYCRYPTOSAT_INSTALL_PATH}")
+ elseif(DEFINED ENV{VIRTUAL_ENV})
+@@ -47,12 +34,8 @@ else()
+ endif()
+
+ string(REPLACE "\n" " " PY_C_CONFIG ${PY_C_CONFIG})
+-string(REPLACE "\n" " " PY_LD_CONFIG ${PY_LD_CONFIG})
+-string(REPLACE "\n" " " PY_LINKFORSHARED_CONFIG ${PY_LINKFORSHARED_CONFIG})
+
+ message(STATUS "Python CFLAGS:  '${PY_C_CONFIG}'")
+-message(STATUS "Python LDFLAGS: '${PY_LD_CONFIG}'")
+-message(STATUS "Python LINKFORSHARED flags: '${PY_LINKFORSHARED_CONFIG}'")
+ message(STATUS "Python module installation prefix: ${PY_INSTALL_PREFIX}")
+
+ set(PY_LD_CONFIG "${PY_LD_CONFIG} ${PY_LINKFORSHARED_CONFIG}")

build/pkgs/cryptominisat/spkg-install.in

@@ -1,5 +1,5 @@
 cd src
 
-sdh_cmake -DUSE_GAUSS='ON' $EXTRA_OPTS
+sdh_cmake -DUSE_GAUSS='ON' -DENABLE_PYTHON_INTERFACE=OFF $EXTRA_OPTS
 sdh_make VERBOSE=ON
 sdh_make_install VERBOSE=ON

build/pkgs/deprecation/SPKG.rst

@@ -0,0 +1,18 @@
+deprecation: A library to handle automated deprecations
+=======================================================
+
+Description
+-----------
+
+A library to handle automated deprecations
+
+License
+-------
+
+Apache 2
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/deprecation/
+

build/pkgs/deprecation/checksums.ini

@@ -0,0 +1,5 @@
+tarball=deprecation-VERSION.tar.gz
+sha1=34847e937ac203cfd0d8ea0a0f2579204cdb8fe4
+md5=6b79c6572fb241e3cecbbd7d539bb66b
+cksum=1034714094
+upstream_url=https://pypi.io/packages/source/d/deprecation/deprecation-VERSION.tar.gz

build/pkgs/deprecation/dependencies

@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/deprecation/install-requires.txt

@@ -0,0 +1 @@
+deprecation

build/pkgs/deprecation/package-version.txt

@@ -0,0 +1 @@
+2.1.0

build/pkgs/deprecation/spkg-install.in

@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .

build/pkgs/deprecation/type

@@ -0,0 +1 @@
+standard

build/pkgs/editables/SPKG.rst

@@ -0,0 +1,18 @@
+editables: Editable installations
+=================================
+
+Description
+-----------
+
+Editable installations
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/editables/
+

build/pkgs/editables/checksums.ini

@@ -0,0 +1,5 @@
+tarball=editables-VERSION.tar.gz
+sha1=a99e0ba3d75e4f439b9742e65cbff24e0b8ce80e
+md5=e91709fbb0ef586cb7b785042068ab67
+cksum=2338248945
+upstream_url=https://pypi.io/packages/source/e/editables/editables-VERSION.tar.gz

build/pkgs/editables/dependencies

@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/editables/install-requires.txt

@@ -0,0 +1 @@
+editables

build/pkgs/editables/package-version.txt

@@ -0,0 +1 @@
+0.3

build/pkgs/editables/spkg-install.in

@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .

build/pkgs/editables/type

@@ -0,0 +1 @@
+standard

build/pkgs/flit_core/checksums.ini

@@ -1,5 +1,5 @@
 tarball=flit_core-VERSION.tar.gz
-sha1=941603f1734b9b4af74954429ef51f97540f30e5
-md5=a4bb11b54bcf029ec2cd5cb981c07ded
-cksum=2905595733
+sha1=fc82acf2a93d3bf6ce41ed1a1160f5be51ffda2a
+md5=4a4791e97f3a8c9a1645064a35636ee6
+cksum=2732326458
 upstream_url=https://pypi.io/packages/source/f/flit_core/flit_core-VERSION.tar.gz

build/pkgs/flit_core/package-version.txt

@@ -1 +1 @@
-3.4.0
+3.7.1

build/pkgs/hatchling/SPKG.rst

@@ -0,0 +1,18 @@
+hatchling: Modern, extensible Python build backend
+==================================================
+
+Description
+-----------
+
+Modern, extensible Python build backend
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/hatchling/
+

build/pkgs/hatchling/checksums.ini

@@ -0,0 +1,5 @@
+tarball=hatchling-VERSION.tar.gz
+sha1=63ae7f29657e4d069c716e098a9ac8114d2f29f9
+md5=e05f845d94f400c3085bbaab21adcdbe
+cksum=3213522818
+upstream_url=https://pypi.io/packages/source/h/hatchling/hatchling-VERSION.tar.gz

build/pkgs/hatchling/dependencies

@@ -0,0 +1,4 @@
+$(PYTHON) pathspec tomli editables pluggy packaging | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/hatchling/install-requires.txt

@@ -0,0 +1 @@
+hatchling

build/pkgs/hatchling/package-version.txt

@@ -0,0 +1 @@
+1.3.1

build/pkgs/hatchling/spkg-install.in

@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .

build/pkgs/hatchling/type

@@ -0,0 +1 @@
+standard

build/pkgs/jsonschema/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN)
+$(PYTHON) vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN) hatchling
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/jupyter_client/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints
+$(PYTHON) jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints hatchling
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/jupyter_packaging/checksums.ini

@@ -0,0 +1,5 @@
+tarball=jupyter_packaging-VERSION.tar.gz
+sha1=c9b7dd75a70ad6a7c621588db410f07fba7e0fad
+md5=d30e6fb387d46398a3ab26765b8fa74f
+cksum=669146472
+upstream_url=https://pypi.io/packages/source/j/jupyter_packaging/jupyter_packaging-VERSION.tar.gz

build/pkgs/jupyter_packaging/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+$(PYTHON) packaging deprecation tomlkit | $(PYTHON_TOOLCHAIN) hatchling
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/jupyter_packaging/package-version.txt

@@ -0,0 +1 @@
+0.12.2

build/pkgs/jupyter_packaging/spkg-install.in

@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .

build/pkgs/jupyter_packaging/type

@@ -1 +1 @@
-optional
+standard

build/pkgs/pathspec/SPKG.rst

@@ -0,0 +1,18 @@
+pathspec: Utility library for gitignore style pattern matching of file paths.
+=============================================================================
+
+Description
+-----------
+
+Utility library for gitignore style pattern matching of file paths.
+
+License
+-------
+
+MPL 2.0
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/pathspec/
+

build/pkgs/pathspec/checksums.ini

@@ -0,0 +1,5 @@
+tarball=pathspec-VERSION.tar.gz
+sha1=afe51c21951f457f82a5810016d0b6752ffc487b
+md5=9b6b70fa5ffc31e6f5700522880140c0
+cksum=3501694416
+upstream_url=https://pypi.io/packages/source/p/pathspec/pathspec-VERSION.tar.gz

build/pkgs/pathspec/dependencies

@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/pathspec/install-requires.txt

@@ -0,0 +1 @@
+pathspec

build/pkgs/pathspec/package-version.txt

@@ -0,0 +1 @@
+0.9.0

build/pkgs/pathspec/spkg-install.in

@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .

build/pkgs/pathspec/type

@@ -0,0 +1 @@
+standard

build/pkgs/pip/checksums.ini

@@ -1,5 +1,5 @@
 tarball=pip-VERSION.tar.gz
-sha1=9b45b63bfa3abaf10235bd149959a36e98eca7f6
-md5=0449e82526e48fc5169a857193f6a63c
-cksum=1661319788
+sha1=be5b671f4868816c6ad2e09258c22bdb3fc82775
+md5=6ec06d38c3aed5d22bcbbbfbf7114d6a
+cksum=3372144553
 upstream_url=https://pypi.io/packages/source/p/pip/pip-VERSION.tar.gz

build/pkgs/pip/package-version.txt

@@ -1 +1 @@
-22.0.2
+22.1.2

build/pkgs/pkgconf/checksums.ini

@@ -1,4 +1,5 @@
-tarball=pkgconf-VERSION.tar.gz
-sha1=9943ba508c3293cd3afb5187f633104f8305af42
-md5=56837bbee89a542ffe7012b4a52caf5b
-cksum=320066684
+tarball=pkgconf-VERSION.tar.xz
+sha1=2b76eb2d88b2c4aecba937b337d218a13b67f14b
+md5=823212dc241793df8ff1d097769a3473
+cksum=896868382
+upstream_url=https://distfiles.dereferenced.org/pkgconf/pkgconf-VERSION.tar.xz

build/pkgs/pkgconf/dependencies

@@ -1,4 +1,4 @@
-| patch
+| patch xz
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/pkgconf/package-version.txt

@@ -1 +1 @@
-0.9.7.p2
+1.8.0