Merge remote-tracking branch 'upstream/develop' into numberfield_abc_imports

Author: Matthias Koeppe

.zenodo.json

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

Makefile

@@ -80,42 +80,6 @@ download:
 dist: build/make/Makefile
 	./sage --sdist
 
-pypi-sdists: sage_setup
-	./sage --sh build/pkgs/sage_conf/spkg-src
-	./sage --sh build/pkgs/sage_sws2rst/spkg-src
-	./sage --sh build/pkgs/sage_docbuild/spkg-src
-	./sage --sh build/pkgs/sage_setup/spkg-src
-	./sage --sh build/pkgs/sagelib/spkg-src
-	./sage --sh build/pkgs/sagemath_objects/spkg-src
-	./sage --sh build/pkgs/sagemath_categories/spkg-src
-	./sage --sh build/pkgs/sagemath_environment/spkg-src
-	./sage --sh build/pkgs/sagemath_repl/spkg-src
-	@echo "Built sdists are in upstream/"
-
-# Ensuring wheels are present, even for packages that may have been installed
-# as editable. Until we have better uninstallation of script packages, we
-# just remove the timestamps, which will lead to rebuilds of the packages.
-PYPI_WHEEL_PACKAGES = sage_sws2rst sage_setup sagemath_environment sagemath_objects sagemath_repl sagemath_categories
-pypi-wheels:
-	for a in $(PYPI_WHEEL_PACKAGES); do \
-	    rm -f venv/var/lib/sage/installed/$$a-*; \
-	done
-	for a in $(PYPI_WHEEL_PACKAGES); do \
-	    $(MAKE) SAGE_EDITABLE=no SAGE_WHEELS=yes $$a; \
-	done
-	@echo "Built wheels are in venv/var/lib/sage/wheels/"
-
-# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
-WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) sage_conf sagelib sage_docbuild
-wheels:
-	for a in $(WHEEL_PACKAGES); do \
-	    rm -f venv/var/lib/sage/installed/$$a-*; \
-	done
-	for a in $(WHEEL_PACKAGES); do \
-	    $(MAKE) SAGE_EDITABLE=no SAGE_WHEELS=yes $$a; \
-	done
-	@echo "Built wheels are in venv/var/lib/sage/wheels/"
-
 ###############################################################################
 # Cleaning up
 ###############################################################################
@@ -380,7 +344,6 @@ list:
 	@$(MAKE) --silent -f build/make/Makefile SAGE_PKGCONFIG=dummy $@
 
 .PHONY: default build dist install micro_release \
-	pypi-sdists pypi-wheels wheels \
 	misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
 	test check testoptional testall testlong testoptionallong testallong \
 	ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.0.beta4, Release Date: 2023-03-12
+SageMath version 10.0.beta5, Release Date: 2023-03-19

build/make/Makefile.in

@@ -128,7 +128,23 @@ PIP_PACKAGES = @SAGE_PIP_PACKAGES@
 # Packages that use the 'script' package build rules
 SCRIPT_PACKAGES = @SAGE_SCRIPT_PACKAGES@
 
-
+# Packages for which we build wheels for PyPI
+PYPI_WHEEL_PACKAGES =				\
+	sage_sws2rst				\
+	sage_setup				\
+	sagemath_environment			\
+	sagemath_objects			\
+	sagemath_repl				\
+	sagemath_categories
+
+# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
+WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES)		\
+	sage_conf				\
+	sagelib					\
+	sage_docbuild
+
+# Packages for which build sdists for PyPI
+PYPI_SDIST_PACKAGES = $(WHEEL_PACKAGES)
 
 # Generate the actual inst_<pkgname> variables; for each package that is
 # actually built this generates a line like:
@@ -198,6 +214,7 @@ SAGE_I_TARGETS = sagelib doc
 # Tell make not to look for files with these names:
 .PHONY: all all-sage all-toolchain all-build all-sageruntime \
 	all-start build-start base toolchain toolchain-deps base-toolchain \
+	pypi-sdists pypi-wheels wheels \
 	sagelib \
 	doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
 	doc-uninstall \
@@ -418,6 +435,25 @@ list-broken-packages: auditwheel_or_delocate
 	    echo >&2 "$$fix_broken_packages"; \
 	fi
 
+pypi-sdists: $(PYPI_SDIST_PACKAGES:%=%-sdist)
+	@echo "Built sdists are in upstream/"
+
+# Ensuring wheels are present, even for packages that may have been installed
+# as editable. Until we have better uninstallation of script packages, we
+# just remove the timestamps, which will lead to rebuilds of the packages.
+pypi-wheels:
+	for a in $(PYPI_WHEEL_PACKAGES); do \
+	    rm -f $(SAGE_VENV)/var/lib/sage/installed/$$a-*; \
+	done
+	$(MAKE_REC) SAGE_EDITABLE=no SAGE_WHEELS=yes $(PYPI_WHEEL_PACKAGES)
+	@echo "Built wheels are in venv/var/lib/sage/wheels/"
+
+wheels:
+	for a in $(WHEEL_PACKAGES); do \
+	    rm -f $(SAGE_VENV)/var/lib/sage/installed/$$a-*; \
+	done
+	$(MAKE_REC) SAGE_EDITABLE=no SAGE_WHEELS=yes $(WHEEL_PACKAGES)
+	@echo "Built wheels are in venv/var/lib/sage/wheels/"
 
 #==============================================================================
 # Setting SAGE_CHECK... variables
@@ -711,6 +747,13 @@ $(1)-uninstall: $(1)-$(4)-uninstall
 
 $(1)-clean: $(1)-uninstall
 
+$(1)-sdist: FORCE python_build sage_setup cython
+	$(AM_V_at) cd '$$(SAGE_ROOT)' && \
+		. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
+		. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
+		. '$$(SAGE_ROOT)/src/bin/sage-env' && \
+		'$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-src'
+
 # Recursive tox invocation (note - we do not set the environment here).
 # Setting SAGE_SPKG_WHEELS is for the benefit of sagelib's tox.ini
 $(1)-tox-%: FORCE

build/pkgs/_prereq/distros/fedora.txt

@@ -30,7 +30,6 @@ gcc-c++
 # The need for which comes [...] from MPIR's configure script
 findutils
 which
-# Needed for pcre configure, see https://github.com/sagemath/sage/issues/29129:
 diffutils
 # Needed for openssl 3.0
 perl-IPC-Cmd

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=d8ef4b8b0d227b2530cff20c65911eb9587828a3
-md5=f58322981d5c5e26b1d9eadf3c2a9132
-cksum=3821522607
+sha1=0ea92e19072c843aa21527e051eff0a0f97eb9ad
+md5=44e659f4d263acad8194e16952762a82
+cksum=3343113057

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-d6c38e59d84f0dcb7c08110445050c1c370f7440
+49c2cd323e638cdfb0444d72daad21b4ddbd1887

build/pkgs/gap/checksums.ini

@@ -1,5 +1,5 @@
 tarball=gap-VERSION.tar.gz
-sha1=4ecdd281b8f430282fb9b12690b06e0a26abde10
-md5=85dc9e459d5b6c66fcad9f468afd3e3e
-cksum=1351843158
+sha1=a6e36f3f874a2c46f51561402634497eab705cca
+md5=c5cd9f272f2703d7a3649ad7193b2d90
+cksum=2760477284
 upstream_url=https://github.com/gap-system/gap/releases/download/vVERSION/gap-VERSION.tar.gz

build/pkgs/gap/package-version.txt

@@ -1 +1 @@
-4.11.1
+4.12.2

build/pkgs/gap/patches/atlasrep-dont_use_network_by_default.patch

@@ -0,0 +1,11 @@
+--- a/pkg/atlasrep/gap/userpref.g	2022-09-06 17:41:17.000000000 -0300
++++ b/pkg/atlasrep/gap/userpref.g	2022-10-29 07:46:48.580833277 -0300
+@@ -46,7 +46,7 @@
+ this information depends on the value of the preference at the time \
+ when the AtlasRep package and its data extensions get loaded."
+     ],
+-  default:= true,
++  default:= false,
+   values:= [ true, false ],
+   multi:= false,
+   package:= "AtlasRep",