Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 4cce3ef

Browse files
author
Matthias Koeppe
committed
Merge tag '9.7.beta4' into t/34110/numpy_1_23
SageMath version 9.7.beta4, Release Date: 2022-07-07
2 parents d87212c + 843eb03 commit 4cce3ef

File tree

312 files changed

+2787
-2289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+2787
-2289
lines changed

‎.zenodo.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 9.7.beta3",
5-
"version": "9.7.beta3",
4+
"title": "sagemath/sage: 9.7.beta4",
5+
"version": "9.7.beta4",
66
"upload_type": "software",
7-
"publication_date": "2022-06-19",
7+
"publication_date": "2022-07-07",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/9.7.beta3",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.7.beta4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ micro_release:
190190
$(MAKE) sagelib-clean
191191
$(MAKE) misc-clean
192192
@echo "Stripping binaries ..."
193-
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
193+
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
194194
@echo "Removing sphinx artifacts..."
195195
rm -rf local/share/doc/sage/doctrees local/share/doc/sage/inventory
196196
@echo "Removing documentation. Inspection in IPython still works."

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.7.beta3, Release Date: 2022-06-19
1+
SageMath version 9.7.beta4, Release Date: 2022-07-07

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=b6a462ba966439bb0cbd460d2bd1cb02d3343fba
3-
md5=95d6ce767184d6ee956feaf65494b4e8
4-
cksum=2637324690
2+
sha1=67951dc1862f7e26d17b1f1021a6dce84dd04724
3+
md5=7e38c980aaf6795906917f7925c61154
4+
cksum=2189559877

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b466c8ae02c04d287d28d2d669e1d111df3724ff
1+
232d0434cfdbac94665d3a1ef2a4eed47e272efb

‎build/pkgs/cryptominisat/checksums.ini

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

‎build/pkgs/cryptominisat/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.6.8
1+
5.8.0

‎build/pkgs/cryptominisat/patches/679.patch

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From a01179ffd6b0dd47bfdef2d9350d80b575571f24 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Maciej=20Bar=C4=87?= <[email protected]>
3+
Date: Sun, 3 Apr 2022 20:02:59 +0200
4+
Subject: [PATCH] python/setup.py.in: import sysconfig instead of importing it
5+
from distutils
6+
MIME-Version: 1.0
7+
Content-Type: text/plain; charset=UTF-8
8+
Content-Transfer-Encoding: 8bit
9+
10+
setuptools 61 dropped sysconfig module
11+
12+
Ref: https://github.com/stamparm/pcapy-ng/commit/f6ce5248f78ac0a247d76e48cff152f4e3f26482
13+
Bug: https://bugs.gentoo.org/836684
14+
15+
Signed-off-by: Maciej Barć <[email protected]>
16+
---
17+
python/setup.py.in | 6 +++---
18+
1 file changed, 3 insertions(+), 3 deletions(-)
19+
20+
diff --git a/python/setup.py.in b/python/setup.py.in
21+
index b3ab64af4..293eb1f80 100644
22+
--- a/python/setup.py.in
23+
+++ b/python/setup.py.in
24+
@@ -27,7 +27,7 @@ import sys
25+
import os
26+
import platform
27+
from distutils.core import setup, Extension
28+
-from distutils import sysconfig
29+
+import sysconfig
30+
from distutils.cmd import Command
31+
32+
__PACKAGE_VERSION__ = "0.2.0"
33+
@@ -59,8 +59,8 @@ def _init_posix(init):
34+
Forces g++ instead of gcc on most systems
35+
credits to eric jones ([email protected]) (found at Google Groups)
36+
"""
37+
- def wrapper():
38+
- init()
39+
+ def wrapper(vars):
40+
+ init(vars)
41+
42+
config_vars = sysconfig.get_config_vars() # by reference
43+
if config_vars["MACHDEP"].startswith("sun"):

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

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
2+
index f549ca7..4a9f0d8 100644
3+
--- a/python/CMakeLists.txt
4+
+++ b/python/CMakeLists.txt
5+
@@ -25,19 +25,6 @@ import sysconfig;
6+
print(sysconfig.get_config_var('CFLAGS'), end = '')"
7+
OUTPUT_VARIABLE PY_C_CONFIG)
8+
9+
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
10+
-from __future__ import print_function;
11+
-import sysconfig;
12+
-print(sysconfig.get_config_var('SHLIBS'), end = '')"
13+
- OUTPUT_VARIABLE PY_LD_CONFIG)
14+
-
15+
-
16+
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
17+
-from __future__ import print_function;
18+
-import sysconfig;
19+
-print(sysconfig.get_config_var('LINKFORSHARED'), end = '')"
20+
- OUTPUT_VARIABLE PY_LINKFORSHARED_CONFIG)
21+
-
22+
if(DEFINED ENV{PYCRYPTOSAT_INSTALL_PATH})
23+
set(PY_INSTALL_PREFIX "--prefix=$ENV{PYCRYPTOSAT_INSTALL_PATH}")
24+
elseif(DEFINED ENV{VIRTUAL_ENV})
25+
@@ -47,12 +34,8 @@ else()
26+
endif()
27+
28+
string(REPLACE "\n" " " PY_C_CONFIG ${PY_C_CONFIG})
29+
-string(REPLACE "\n" " " PY_LD_CONFIG ${PY_LD_CONFIG})
30+
-string(REPLACE "\n" " " PY_LINKFORSHARED_CONFIG ${PY_LINKFORSHARED_CONFIG})
31+
32+
message(STATUS "Python CFLAGS: '${PY_C_CONFIG}'")
33+
-message(STATUS "Python LDFLAGS: '${PY_LD_CONFIG}'")
34+
-message(STATUS "Python LINKFORSHARED flags: '${PY_LINKFORSHARED_CONFIG}'")
35+
message(STATUS "Python module installation prefix: ${PY_INSTALL_PREFIX}")
36+
37+
set(PY_LD_CONFIG "${PY_LD_CONFIG} ${PY_LINKFORSHARED_CONFIG}")

‎build/pkgs/cryptominisat/spkg-install.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cd src
22

3-
sdh_cmake -DUSE_GAUSS='ON' $EXTRA_OPTS
3+
sdh_cmake -DUSE_GAUSS='ON' -DENABLE_PYTHON_INTERFACE=OFF $EXTRA_OPTS
44
sdh_make VERBOSE=ON
55
sdh_make_install VERBOSE=ON

‎build/pkgs/deprecation/SPKG.rst

+18

‎build/pkgs/deprecation/checksums.ini

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=deprecation-VERSION.tar.gz
2+
sha1=34847e937ac203cfd0d8ea0a0f2579204cdb8fe4
3+
md5=6b79c6572fb241e3cecbbd7d539bb66b
4+
cksum=1034714094
5+
upstream_url=https://pypi.io/packages/source/d/deprecation/deprecation-VERSION.tar.gz

‎build/pkgs/deprecation/dependencies

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

‎build/pkgs/deprecation/install-requires.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deprecation

‎build/pkgs/deprecation/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.1.0

‎build/pkgs/deprecation/spkg-install.in

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cd src
2+
sdh_pip_install .

‎build/pkgs/deprecation/type

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
standard

‎build/pkgs/editables/SPKG.rst

+18

‎build/pkgs/editables/checksums.ini

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=editables-VERSION.tar.gz
2+
sha1=a99e0ba3d75e4f439b9742e65cbff24e0b8ce80e
3+
md5=e91709fbb0ef586cb7b785042068ab67
4+
cksum=2338248945
5+
upstream_url=https://pypi.io/packages/source/e/editables/editables-VERSION.tar.gz

‎build/pkgs/editables/dependencies

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

‎build/pkgs/editables/install-requires.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
editables

‎build/pkgs/editables/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.3

‎build/pkgs/editables/spkg-install.in

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cd src
2+
sdh_pip_install .

‎build/pkgs/editables/type

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
standard

‎build/pkgs/flit_core/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=flit_core-VERSION.tar.gz
2-
sha1=941603f1734b9b4af74954429ef51f97540f30e5
3-
md5=a4bb11b54bcf029ec2cd5cb981c07ded
4-
cksum=2905595733
2+
sha1=fc82acf2a93d3bf6ce41ed1a1160f5be51ffda2a
3+
md5=4a4791e97f3a8c9a1645064a35636ee6
4+
cksum=2732326458
55
upstream_url=https://pypi.io/packages/source/f/flit_core/flit_core-VERSION.tar.gz

‎build/pkgs/flit_core/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.0
1+
3.7.1

‎build/pkgs/hatchling/SPKG.rst

+18

‎build/pkgs/hatchling/checksums.ini

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=hatchling-VERSION.tar.gz
2+
sha1=63ae7f29657e4d069c716e098a9ac8114d2f29f9
3+
md5=e05f845d94f400c3085bbaab21adcdbe
4+
cksum=3213522818
5+
upstream_url=https://pypi.io/packages/source/h/hatchling/hatchling-VERSION.tar.gz

‎build/pkgs/hatchling/dependencies

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

‎build/pkgs/hatchling/install-requires.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
hatchling

‎build/pkgs/hatchling/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.3.1

‎build/pkgs/hatchling/spkg-install.in

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cd src
2+
sdh_pip_install .

‎build/pkgs/hatchling/type

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
standard

‎build/pkgs/jsonschema/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN)
1+
$(PYTHON) vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN) hatchling
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/jupyter_client/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints
1+
$(PYTHON) jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints hatchling
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/jupyter_packaging/checksums.ini

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=jupyter_packaging-VERSION.tar.gz
2+
sha1=c9b7dd75a70ad6a7c621588db410f07fba7e0fad
3+
md5=d30e6fb387d46398a3ab26765b8fa74f
4+
cksum=669146472
5+
upstream_url=https://pypi.io/packages/source/j/jupyter_packaging/jupyter_packaging-VERSION.tar.gz

‎build/pkgs/jupyter_packaging/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) | $(PYTHON_TOOLCHAIN)
1+
$(PYTHON) packaging deprecation tomlkit | $(PYTHON_TOOLCHAIN) hatchling
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/jupyter_packaging/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.12.2

‎build/pkgs/jupyter_packaging/requirements.txt

-1
This file was deleted.

‎build/pkgs/jupyter_packaging/spkg-install.in

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cd src
2+
sdh_pip_install .

‎build/pkgs/jupyter_packaging/type

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
optional
1+
standard

‎build/pkgs/pathspec/SPKG.rst

+18

‎build/pkgs/pathspec/checksums.ini

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=pathspec-VERSION.tar.gz
2+
sha1=afe51c21951f457f82a5810016d0b6752ffc487b
3+
md5=9b6b70fa5ffc31e6f5700522880140c0
4+
cksum=3501694416
5+
upstream_url=https://pypi.io/packages/source/p/pathspec/pathspec-VERSION.tar.gz

‎build/pkgs/pathspec/dependencies

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

‎build/pkgs/pathspec/install-requires.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pathspec

‎build/pkgs/pathspec/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.9.0

‎build/pkgs/pathspec/spkg-install.in

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cd src
2+
sdh_pip_install .

‎build/pkgs/pathspec/type

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
standard

‎build/pkgs/pip/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pip-VERSION.tar.gz
2-
sha1=9b45b63bfa3abaf10235bd149959a36e98eca7f6
3-
md5=0449e82526e48fc5169a857193f6a63c
4-
cksum=1661319788
2+
sha1=be5b671f4868816c6ad2e09258c22bdb3fc82775
3+
md5=6ec06d38c3aed5d22bcbbbfbf7114d6a
4+
cksum=3372144553
55
upstream_url=https://pypi.io/packages/source/p/pip/pip-VERSION.tar.gz

‎build/pkgs/pip/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.0.2
1+
22.1.2

‎build/pkgs/pkgconf/checksums.ini

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

‎build/pkgs/pkgconf/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| patch
1+
| patch xz
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/pkgconf/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.9.7.p2
1+
1.8.0

0 commit comments

Comments
 (0)