Merge tag '9.8.beta6' into t/34849/more_fixes_to_support_tox_4

SageMath version 9.8.beta6, Release Date: 2022-12-21

.github/workflows/ci-cygwin-standard.yml

@@ -61,11 +61,13 @@ jobs:
     needs: [cygwin-stage-i-a, cygwin-stage-i-b]
 
   cygwin-stage-ii-e:
-    uses: ./.github/workflows/cygwin.yml
-    with:
-      stage: ii-e
-      previous_stages: i-*
-      targets: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs zn_poly sympow
+    env:
+      STAGE: ii-e
+      PREVIOUS_STAGES: i-*
+      TARGETS: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow
+      LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
+      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
+
     needs: [cygwin-stage-i-a, cygwin-stage-i-b]
 
 ############################################## stage-iii ##########################################

.github/workflows/dist.yml

@@ -18,8 +18,9 @@ jobs:
 
   release_dist:
 
-    # This job, in contrast to "dist" in tox.yml,
-    # does not use "configure --enable-download-from-upstream-url".
+    # This job, in contrast to "dist" in ci-macos.yml,
+    # does not use "configure --enable-download-from-upstream-url"
+    # (the default since #32390).
     #
     # In this way, we check that all necessary package tarballs
     # have already been uploaded to the Sage server at the time
@@ -38,7 +39,7 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
       - name: make dist
         run: |
-          ./bootstrap -D && ./configure && make dist
+          ./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
       - uses: actions/upload-artifact@v3
         with:
           path: "dist/*.tar.gz"

.gitignore

@@ -157,7 +157,6 @@ __pycache__/
 !/src/sage/rings/polynomial/weil/power_sums.c
 !/src/sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp
 !/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp
-!/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_zn_poly.cpp
 !/src/sage/stats/distributions/dgs_bern.c
 !/src/sage/stats/distributions/dgs_gauss_dp.c
 !/src/sage/stats/distributions/dgs_gauss_mp.c

.vscode/settings.json

@@ -27,7 +27,7 @@
     "python.linting.enabled": true,
     // The following pycodestyle arguments are the same as the pycodestyle-minimal
     // tox environnment, see the file SAGE_ROOT/src/tox.ini
-    "python.linting.pycodestyleArgs": ["--select=E111,E306,E401,E701,E702,E703,W391,W605,E711,E712,E713,E721,E722"],
+    "python.linting.pycodestyleArgs": ["--select=E111,E306,E401,E701,E702,E703,W291,W391,W605,E711,E712,E713,E721,E722"],
     "cSpell.words": [
         "furo",
         "Conda",

.zenodo.json

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

COPYING.txt

@@ -130,7 +130,6 @@ tachyon                     Modified BSD
 threejs                     MIT License
 tornado                     Apache License
 zlib                        Custom (Modified BSD)
-zn_poly                     GPLv2 or GPLv3 (no later versions, see below)
 
 CONTACT INFO:
      William Stein; [email protected];
@@ -1346,53 +1345,4 @@ Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
   Jean-loup Gailly [email protected]
   Mark Adler [email protected]
 
-
-================================================================================
-
-zn_poly: a library for polynomial arithmetic (version 0.9)
-
-Copyright (C) 2007, 2008, David Harvey
-
-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) version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License,
-along with this program (see gpl-2.0.txt and gpl-3.0.txt). If not,
-see <http://www.gnu.org/licenses/>.
-
-Licensing notes:
-
-(1)
-zn_poly is NOT released under the "GPL v2 or later" or "GPL v3 or later".
-Both v2 and v3 are fine, but for now I am excluding later versions. If you
-need zn_poly under a different license, ask me and I'll consider it.
-
-(2)
-zn_poly incorporates small amounts of code from other projects:
-
-   (2a)
-   The file "wide_arith.h" includes some assembly macros from the file
-   "longlong.h" in GMP 4.2.1; see http://gmplib.org/. The copyright to this
-   code is held by the Free Software Foundation, and it was released under
-   "LGPL v2.1 or later".
-
-   (2b)
-   The file "wide_arith.h" also includes assembly macros from the file
-   "SPMM_ASM.h" in NTL 5.4.1; see http://www.shoup.net/ntl/. The copyright
-   to this code is held by Victor Shoup, and it was released under "GPL v2 or
-   later".
-
-   (2c)
-   The filer "profiler.h" contains x86 cycle counting code from the file
-   "profiler.h" in FLINT 1.0; see http://www.flintlib.org/. The copyright
-   to this code is held by William Hart, and it was released under "GPL v2 or
-   later".
-
 ===============================================================================

README.md

@@ -409,7 +409,7 @@ SAGE_ROOT                 Root directory (sage-x.y in Sage tarball)
 │   └── pkgs              Every package is a subdirectory here
 │       ├── 4ti2/
 │       …
-│       └── zn_poly/
+│       └── zlib/
 ├── configure             Top-level configure script
 ├── COPYING.txt           Copyright information
 ├── pkgs                  Source trees of Python distribution packages
@@ -456,7 +456,7 @@ SAGE_ROOT                 Root directory (sage-x.y in Sage tarball)
 │   └── pkgs              Build logs of individual packages
 │       ├── alabaster-0.7.12.log
 │       …
-│       └── zn_poly-0.9.2.log
+│       └── zlib-1.2.11.log
 ├── m4                    M4 macros for generating the configure script
 │   └── *.m4
 ├── Makefile              Running "make" uses this file
@@ -470,7 +470,7 @@ SAGE_ROOT                 Root directory (sage-x.y in Sage tarball)
 ├── upstream              Source tarballs of packages
 │   ├── Babel-2.9.1.tar.gz
 │   …
-│   └── zn_poly-0.9.2.tar.gz
+│   └── zlib-1.2.11.tar.gz
 ├── venv -> SAGE_VENV     Convenience symlink to the virtual environment
 └── VERSION.txt
 ```

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.8.beta5, Release Date: 2022-12-11
+SageMath version 9.8.beta6, Release Date: 2022-12-21

build/bin/sage-package

@@ -18,7 +18,7 @@
 #   arb
 #   autotools
 #   [...]
-#   zn_poly
+#   zlib
 #
 # * Find the package name given a tarball filename
 #

build/pkgs/argon2_cffi/checksums.ini

@@ -1,5 +1,5 @@
 tarball=argon2-cffi-VERSION.tar.gz
-sha1=c79943104960db3024346731d5153392c187c0d7
-md5=e49ccb29351387fd853f31bf19b67f59
-cksum=3765128778
+sha1=c16c1506de0211bdfa23d4d51e780fb4aaff5222
+md5=b7843e8690c790f8e743d37bb75c25a8
+cksum=3700408796
 upstream_url=https://pypi.io/packages/source/a/argon2_cffi/argon2-cffi-VERSION.tar.gz

build/pkgs/argon2_cffi/package-version.txt

@@ -1 +1 @@
-20.1.0
+21.3.0

build/pkgs/attrs/checksums.ini

@@ -1,5 +1,5 @@
 tarball=attrs-VERSION.tar.gz
-sha1=693de5a8890c6f7bad4edd6ade6971ab3eaf416b
-md5=5a9b5e9ceebc380a13fb93235b11bbda
-cksum=2935089723
+sha1=16d99f8e6f84309a4e399babc2e237da87b445ad
+md5=0487081b7ead8753fc46cf7c6d1e28e3
+cksum=3993993002
 upstream_url=https://pypi.io/packages/source/a/attrs/attrs-VERSION.tar.gz

build/pkgs/attrs/package-version.txt

@@ -1 +1 @@
-21.4.0
+22.1.0

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=cd10867f6ee013a5f7fcfa6c9c69b1aed1939399
-md5=dbbcb33cd3ea96259a902cdffad84ab9
-cksum=423684136
+sha1=03fa7a341ddf380aa4fe54a85b0c41debd2ffe7e
+md5=6fdfcb62364de0e8c8d57f5d3a38c909
+cksum=3919137984

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-325b7c119c0cf14948e6052709a814bcd6e3f477
+7819a59980b78950a0eb4aa18c529efa380d687b

build/pkgs/cppy/checksums.ini

@@ -1,5 +1,5 @@
 tarball=cppy-VERSION.tar.gz
-sha1=3af4f5f14ef1f9b49d7457e2fa5c241c721db29c
-md5=2110891d75aa12551deebba1603428c6
-cksum=793876648
+sha1=c82ee7a4f38e302bfe4de2a695d2bdfefb69951f
+md5=7c1f825c43dd66454440932a35b9969c
+cksum=1879136901
 upstream_url=https://files.pythonhosted.org/packages/source/c/cppy/cppy-VERSION.tar.gz

build/pkgs/cppy/package-version.txt

@@ -1 +1 @@
-1.1.0
+1.2.1

build/pkgs/docutils/checksums.ini

@@ -1,5 +1,5 @@
 tarball=docutils-VERSION.tar.gz
-sha1=f423535c12fcd2a68d4fc52525fbe36020a58ab5
-md5=ed810564c25063e9dac10dd0893ead47
-cksum=3160620183
+sha1=c38c6ccd1547b4d651e39b64dd6be676be5f14d5
+md5=0afa992a6e93db892107c3f087d0d9df
+cksum=658477137
 upstream_url=https://pypi.io/packages/source/d/docutils/docutils-VERSION.tar.gz

build/pkgs/docutils/package-version.txt

@@ -1 +1 @@
-0.17.1
+0.19

build/pkgs/gmpy2/checksums.ini

@@ -1,5 +1,5 @@
 tarball=gmpy2-VERSION.tar.gz
-sha1=fcb929ab9a44d96bfb47b7ed411cc2f048b484b2
-md5=877d324e676b162053772affda5c0de7
-cksum=2408333571
+sha1=8280f6c68c57dd4a2fce149162c080c1dac86eb0
+md5=bb21846e99800e04d5b330b76c23ba10
+cksum=3835762323
 upstream_url=https://pypi.io/packages/source/g/gmpy2/gmpy2-VERSION.tar.gz

build/pkgs/gmpy2/package-version.txt

@@ -1 +1 @@
-2.1.1
+2.1.2

build/pkgs/hatch_nodejs_version/checksums.ini

@@ -1,5 +1,5 @@
 tarball=hatch_nodejs_version-VERSION.tar.gz
-sha1=27420a3bae3f787640b2c8ad522d75fa32526294
-md5=644c2aea7558de91bbd66217fec6a1b9
-cksum=4058013444
+sha1=ce77992d461d5108c481e985250cfb401b4ee5df
+md5=6e5f9d5cfa442572637478cacaa8ea81
+cksum=1271494344
 upstream_url=https://pypi.io/packages/source/h/hatch_nodejs_version/hatch_nodejs_version-VERSION.tar.gz

build/pkgs/hatch_nodejs_version/package-version.txt

@@ -1 +1 @@
-0.3.0
+0.3.1

build/pkgs/importlib_metadata/checksums.ini

@@ -1,5 +1,5 @@
 tarball=importlib_metadata-VERSION.tar.gz
-sha1=38794db2afb90ed0be04bd8b5996a5b5fd45acc2
-md5=ccd58a387cc2bab6cf72fdf21e403749
-cksum=758044022
+sha1=4a49e8c6d8e2eb02e9ea821444b5ba153d8c34a6
+md5=56d34f2e854bb0f318baa9e47aba3439
+cksum=3438247256
 upstream_url=https://pypi.io/packages/source/i/importlib_metadata/importlib_metadata-VERSION.tar.gz

build/pkgs/importlib_metadata/package-version.txt

@@ -1 +1 @@
-5.0.0
+5.1.0

build/pkgs/jsonschema/checksums.ini

@@ -1,5 +1,5 @@
 tarball=jsonschema-VERSION.tar.gz
-sha1=912d562c1394408dca582e14843e3245df2f3827
-md5=3bc1f63a74fc61bf2847f22cadb0dfff
-cksum=2200261176
+sha1=ccea159a8a0c453e6fbbcfd7bb681b1bc766500e
+md5=527bc4d51d31e8d0b8a0d833b6a50002
+cksum=1885537635
 upstream_url=https://pypi.io/packages/source/j/jsonschema/jsonschema-VERSION.tar.gz

build/pkgs/jsonschema/package-version.txt

@@ -1 +1 @@
-4.16.0
+4.17.1

build/pkgs/openblas/dependencies

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

build/pkgs/pathspec/checksums.ini

@@ -1,5 +1,5 @@
 tarball=pathspec-VERSION.tar.gz
-sha1=ef0f4b07097506575ca8052256b56f137a7b170d
-md5=6f4fde5e701d328a2846d206edb63aa9
-cksum=2376511942
+sha1=418ae4112af18af995c0f20a22e5a903b8ce50ae
+md5=28c87c3581b10152c4581d10fe33f765
+cksum=2161527634
 upstream_url=https://pypi.io/packages/source/p/pathspec/pathspec-VERSION.tar.gz

build/pkgs/pathspec/package-version.txt

@@ -1 +1 @@
-0.10.1
+0.10.2

build/pkgs/pint/checksums.ini

@@ -1,5 +1,5 @@
 tarball=Pint-VERSION.tar.gz
-sha1=98496b31efc63adfbf640953351aafc51cb46584
-md5=b14aa24f4a4bcbc2c2fae797b25d0b3e
-cksum=3392069525
+sha1=c14ac08ca2d5a68d79ea7cd2252dc7e2a572c56a
+md5=522a8e633e487e92ba54ccbec395947a
+cksum=2139030399
 upstream_url=https://pypi.io/packages/source/p/pint/Pint-VERSION.tar.gz

build/pkgs/pint/package-version.txt

@@ -1 +1 @@
-0.17
+0.20.1

build/pkgs/pip/checksums.ini

@@ -1,5 +1,5 @@
 tarball=pip-VERSION.tar.gz
-sha1=a6d9d6b04f17acb11f214db9835f4b66e12a1fe2
-md5=f0dd02265e7ccd2f8758c840fba64810
-cksum=1176625017
+sha1=29167fffe19874a74247fe92f4fdba1bb1221c61
+md5=996f58a94fe0b8b82b6795c42bd171ba
+cksum=537001443
 upstream_url=https://pypi.io/packages/source/p/pip/pip-VERSION.tar.gz

build/pkgs/pip/package-version.txt

@@ -1 +1 @@
-22.3
+22.3.1

build/pkgs/platformdirs/checksums.ini

@@ -1,5 +1,5 @@
 tarball=platformdirs-VERSION.tar.gz
-sha1=344841a3cd4eb5b1a1b8adb8a57e845e5a06b236
-md5=2301a8a29c3082a49ee293073d893887
-cksum=1100125935
+sha1=082974f7d3ea03adfa147f4ab5be76079c2a116f
+md5=f449b7f3767577fa2a57465a4523e92e
+cksum=2966639810
 upstream_url=https://pypi.io/packages/source/p/platformdirs/platformdirs-VERSION.tar.gz

build/pkgs/platformdirs/package-version.txt

@@ -1 +1 @@
-2.5.2
+2.5.4

build/pkgs/pybind11/checksums.ini

@@ -1,5 +1,5 @@
 tarball=pybind11-VERSION.tar.gz
-sha1=cee2f3c7879783bb5f021c7db332f8a290fe3763
-md5=c232928479f398693bface2731387691
-cksum=3770559962
+sha1=d0e6e22c2ce36fad4bb60dbac4d6d498ceb464df
+md5=0b181dbb44c3cc632e724cef5081cae1
+cksum=4287838207
 upstream_url=https://pypi.io/packages/source/p/pybind11/pybind11-VERSION.tar.gz

build/pkgs/pybind11/package-version.txt

@@ -1 +1 @@
-2.9.2
+2.10.1

build/pkgs/pyrsistent/checksums.ini

@@ -1,5 +1,5 @@
 tarball=pyrsistent-VERSION.tar.gz
-sha1=58f9efc4800acb6f7a083688e988187cccee2266
-md5=cef3da08455664bf917dcf8cd00d49a4
-cksum=350737156
+sha1=a2c5cc517a33dcfd3918d3eabf4859b8901d3913
+md5=23da81256b8817e123568a858bf78997
+cksum=1165148669
 upstream_url=https://pypi.io/packages/source/p/pyrsistent/pyrsistent-VERSION.tar.gz

build/pkgs/pyrsistent/package-version.txt

@@ -1 +1 @@
-0.18.1
+0.19.2

build/pkgs/pyzmq/checksums.ini

@@ -1,5 +1,5 @@
 tarball=pyzmq-VERSION.tar.gz
-sha1=b31a94f504ef3104a28e64d88b7c1feafb124982
-md5=7de9c7bb05cc89d21e4105ec1ac7c270
-cksum=936855776
+sha1=1a2e7220d7d1b6167c14ae2cc001dfc5d9a28dde
+md5=f10b7c3dee2c03557e2c5d00b73dfc7f
+cksum=1163982926
 upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz

build/pkgs/pyzmq/package-version.txt

@@ -1 +1 @@
-23.2.0
+24.0.1

build/pkgs/sage_conf/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 9.8b5
+sage-conf ~= 9.8b6

build/pkgs/sage_docbuild/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 9.8b5
+sage-docbuild ~= 9.8b6

build/pkgs/sage_setup/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 9.8b5
+sage-setup ~= 9.8b6

build/pkgs/sage_sws2rst/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 9.8b5
+sage-sws2rst ~= 9.8b6

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 jinja2 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 zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 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 $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
 
 ----------
 All lines of this file are ignored except the first.