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

Commit 071c113

Browse files
author
Matthias Koeppe
committed
Merge tag '9.8.beta6' into t/34849/more_fixes_to_support_tox_4
SageMath version 9.8.beta6, Release Date: 2022-12-21
2 parents 1999bd6 + 2114066 commit 071c113

File tree

254 files changed

+2407
-2022
lines changed

Some content is hidden

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

254 files changed

+2407
-2022
lines changed

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

+1,044
Large diffs are not rendered by default.

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ jobs:
6161
needs: [cygwin-stage-i-a, cygwin-stage-i-b]
6262

6363
cygwin-stage-ii-e:
64-
uses: ./.github/workflows/cygwin.yml
65-
with:
66-
stage: ii-e
67-
previous_stages: i-*
68-
targets: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs zn_poly sympow
64+
env:
65+
STAGE: ii-e
66+
PREVIOUS_STAGES: i-*
67+
TARGETS: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow
68+
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
69+
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
70+
6971
needs: [cygwin-stage-i-a, cygwin-stage-i-b]
7072

7173
############################################## stage-iii ##########################################

.github/workflows/dist.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ jobs:
1818

1919
release_dist:
2020

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

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ __pycache__/
157157
!/src/sage/rings/polynomial/weil/power_sums.c
158158
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp
159159
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp
160-
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_zn_poly.cpp
161160
!/src/sage/stats/distributions/dgs_bern.c
162161
!/src/sage/stats/distributions/dgs_gauss_dp.c
163162
!/src/sage/stats/distributions/dgs_gauss_mp.c

.vscode/settings.json

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

.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.8.beta5",
5-
"version": "9.8.beta5",
4+
"title": "sagemath/sage: 9.8.beta6",
5+
"version": "9.8.beta6",
66
"upload_type": "software",
7-
"publication_date": "2022-12-11",
7+
"publication_date": "2022-12-21",
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.8.beta5",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.8.beta6",
1919
"relation": "isSupplementTo"
2020
},
2121
{

COPYING.txt

-50
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ tachyon Modified BSD
130130
threejs MIT License
131131
tornado Apache License
132132
zlib Custom (Modified BSD)
133-
zn_poly GPLv2 or GPLv3 (no later versions, see below)
134133

135134
CONTACT INFO:
136135
William Stein; [email protected];
@@ -1346,53 +1345,4 @@ Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
13461345
Jean-loup Gailly [email protected]
13471346
Mark Adler [email protected]
13481347

1349-
1350-
================================================================================
1351-
1352-
zn_poly: a library for polynomial arithmetic (version 0.9)
1353-
1354-
Copyright (C) 2007, 2008, David Harvey
1355-
1356-
This program is free software: you can redistribute it and/or modify
1357-
it under the terms of the GNU General Public License as published by
1358-
the Free Software Foundation, either version 2 of the License, or
1359-
(at your option) version 3 of the License.
1360-
1361-
This program is distributed in the hope that it will be useful,
1362-
but WITHOUT ANY WARRANTY; without even the implied warranty of
1363-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1364-
GNU General Public License for more details.
1365-
1366-
You should have received a copy of the GNU General Public License,
1367-
along with this program (see gpl-2.0.txt and gpl-3.0.txt). If not,
1368-
see <http://www.gnu.org/licenses/>.
1369-
1370-
Licensing notes:
1371-
1372-
(1)
1373-
zn_poly is NOT released under the "GPL v2 or later" or "GPL v3 or later".
1374-
Both v2 and v3 are fine, but for now I am excluding later versions. If you
1375-
need zn_poly under a different license, ask me and I'll consider it.
1376-
1377-
(2)
1378-
zn_poly incorporates small amounts of code from other projects:
1379-
1380-
(2a)
1381-
The file "wide_arith.h" includes some assembly macros from the file
1382-
"longlong.h" in GMP 4.2.1; see http://gmplib.org/. The copyright to this
1383-
code is held by the Free Software Foundation, and it was released under
1384-
"LGPL v2.1 or later".
1385-
1386-
(2b)
1387-
The file "wide_arith.h" also includes assembly macros from the file
1388-
"SPMM_ASM.h" in NTL 5.4.1; see http://www.shoup.net/ntl/. The copyright
1389-
to this code is held by Victor Shoup, and it was released under "GPL v2 or
1390-
later".
1391-
1392-
(2c)
1393-
The filer "profiler.h" contains x86 cycle counting code from the file
1394-
"profiler.h" in FLINT 1.0; see http://www.flintlib.org/. The copyright
1395-
to this code is held by William Hart, and it was released under "GPL v2 or
1396-
later".
1397-
13981348
===============================================================================

README.md

+3-3

VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.8.beta5, Release Date: 2022-12-11
1+
SageMath version 9.8.beta6, Release Date: 2022-12-21

build/bin/sage-package

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# arb
1919
# autotools
2020
# [...]
21-
# zn_poly
21+
# zlib
2222
#
2323
# * Find the package name given a tarball filename
2424
#

build/pkgs/argon2_cffi/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=argon2-cffi-VERSION.tar.gz
2-
sha1=c79943104960db3024346731d5153392c187c0d7
3-
md5=e49ccb29351387fd853f31bf19b67f59
4-
cksum=3765128778
2+
sha1=c16c1506de0211bdfa23d4d51e780fb4aaff5222
3+
md5=b7843e8690c790f8e743d37bb75c25a8
4+
cksum=3700408796
55
upstream_url=https://pypi.io/packages/source/a/argon2_cffi/argon2-cffi-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.1.0
1+
21.3.0

build/pkgs/attrs/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=attrs-VERSION.tar.gz
2-
sha1=693de5a8890c6f7bad4edd6ade6971ab3eaf416b
3-
md5=5a9b5e9ceebc380a13fb93235b11bbda
4-
cksum=2935089723
2+
sha1=16d99f8e6f84309a4e399babc2e237da87b445ad
3+
md5=0487081b7ead8753fc46cf7c6d1e28e3
4+
cksum=3993993002
55
upstream_url=https://pypi.io/packages/source/a/attrs/attrs-VERSION.tar.gz

build/pkgs/attrs/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21.4.0
1+
22.1.0

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=cd10867f6ee013a5f7fcfa6c9c69b1aed1939399
3-
md5=dbbcb33cd3ea96259a902cdffad84ab9
4-
cksum=423684136
2+
sha1=03fa7a341ddf380aa4fe54a85b0c41debd2ffe7e
3+
md5=6fdfcb62364de0e8c8d57f5d3a38c909
4+
cksum=3919137984
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
325b7c119c0cf14948e6052709a814bcd6e3f477
1+
7819a59980b78950a0eb4aa18c529efa380d687b

build/pkgs/cppy/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=cppy-VERSION.tar.gz
2-
sha1=3af4f5f14ef1f9b49d7457e2fa5c241c721db29c
3-
md5=2110891d75aa12551deebba1603428c6
4-
cksum=793876648
2+
sha1=c82ee7a4f38e302bfe4de2a695d2bdfefb69951f
3+
md5=7c1f825c43dd66454440932a35b9969c
4+
cksum=1879136901
55
upstream_url=https://files.pythonhosted.org/packages/source/c/cppy/cppy-VERSION.tar.gz

build/pkgs/cppy/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0
1+
1.2.1

build/pkgs/docutils/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=docutils-VERSION.tar.gz
2-
sha1=f423535c12fcd2a68d4fc52525fbe36020a58ab5
3-
md5=ed810564c25063e9dac10dd0893ead47
4-
cksum=3160620183
2+
sha1=c38c6ccd1547b4d651e39b64dd6be676be5f14d5
3+
md5=0afa992a6e93db892107c3f087d0d9df
4+
cksum=658477137
55
upstream_url=https://pypi.io/packages/source/d/docutils/docutils-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.17.1
1+
0.19

build/pkgs/gmpy2/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=gmpy2-VERSION.tar.gz
2-
sha1=fcb929ab9a44d96bfb47b7ed411cc2f048b484b2
3-
md5=877d324e676b162053772affda5c0de7
4-
cksum=2408333571
2+
sha1=8280f6c68c57dd4a2fce149162c080c1dac86eb0
3+
md5=bb21846e99800e04d5b330b76c23ba10
4+
cksum=3835762323
55
upstream_url=https://pypi.io/packages/source/g/gmpy2/gmpy2-VERSION.tar.gz

build/pkgs/gmpy2/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.1
1+
2.1.2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=hatch_nodejs_version-VERSION.tar.gz
2-
sha1=27420a3bae3f787640b2c8ad522d75fa32526294
3-
md5=644c2aea7558de91bbd66217fec6a1b9
4-
cksum=4058013444
2+
sha1=ce77992d461d5108c481e985250cfb401b4ee5df
3+
md5=6e5f9d5cfa442572637478cacaa8ea81
4+
cksum=1271494344
55
upstream_url=https://pypi.io/packages/source/h/hatch_nodejs_version/hatch_nodejs_version-VERSION.tar.gz
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.0
1+
0.3.1
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=importlib_metadata-VERSION.tar.gz
2-
sha1=38794db2afb90ed0be04bd8b5996a5b5fd45acc2
3-
md5=ccd58a387cc2bab6cf72fdf21e403749
4-
cksum=758044022
2+
sha1=4a49e8c6d8e2eb02e9ea821444b5ba153d8c34a6
3+
md5=56d34f2e854bb0f318baa9e47aba3439
4+
cksum=3438247256
55
upstream_url=https://pypi.io/packages/source/i/importlib_metadata/importlib_metadata-VERSION.tar.gz
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0
1+
5.1.0

build/pkgs/jsonschema/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=jsonschema-VERSION.tar.gz
2-
sha1=912d562c1394408dca582e14843e3245df2f3827
3-
md5=3bc1f63a74fc61bf2847f22cadb0dfff
4-
cksum=2200261176
2+
sha1=ccea159a8a0c453e6fbbcfd7bb681b1bc766500e
3+
md5=527bc4d51d31e8d0b8a0d833b6a50002
4+
cksum=1885537635
55
upstream_url=https://pypi.io/packages/source/j/jsonschema/jsonschema-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.16.0
1+
4.17.1

build/pkgs/openblas/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gfortran | $(PYTHON)
1+
gfortran
22

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

build/pkgs/pathspec/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pathspec-VERSION.tar.gz
2-
sha1=ef0f4b07097506575ca8052256b56f137a7b170d
3-
md5=6f4fde5e701d328a2846d206edb63aa9
4-
cksum=2376511942
2+
sha1=418ae4112af18af995c0f20a22e5a903b8ce50ae
3+
md5=28c87c3581b10152c4581d10fe33f765
4+
cksum=2161527634
55
upstream_url=https://pypi.io/packages/source/p/pathspec/pathspec-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.1
1+
0.10.2

build/pkgs/pint/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=Pint-VERSION.tar.gz
2-
sha1=98496b31efc63adfbf640953351aafc51cb46584
3-
md5=b14aa24f4a4bcbc2c2fae797b25d0b3e
4-
cksum=3392069525
2+
sha1=c14ac08ca2d5a68d79ea7cd2252dc7e2a572c56a
3+
md5=522a8e633e487e92ba54ccbec395947a
4+
cksum=2139030399
55
upstream_url=https://pypi.io/packages/source/p/pint/Pint-VERSION.tar.gz

build/pkgs/pint/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.17
1+
0.20.1

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=a6d9d6b04f17acb11f214db9835f4b66e12a1fe2
3-
md5=f0dd02265e7ccd2f8758c840fba64810
4-
cksum=1176625017
2+
sha1=29167fffe19874a74247fe92f4fdba1bb1221c61
3+
md5=996f58a94fe0b8b82b6795c42bd171ba
4+
cksum=537001443
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.3
1+
22.3.1

build/pkgs/platformdirs/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=platformdirs-VERSION.tar.gz
2-
sha1=344841a3cd4eb5b1a1b8adb8a57e845e5a06b236
3-
md5=2301a8a29c3082a49ee293073d893887
4-
cksum=1100125935
2+
sha1=082974f7d3ea03adfa147f4ab5be76079c2a116f
3+
md5=f449b7f3767577fa2a57465a4523e92e
4+
cksum=2966639810
55
upstream_url=https://pypi.io/packages/source/p/platformdirs/platformdirs-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.2
1+
2.5.4

build/pkgs/pybind11/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pybind11-VERSION.tar.gz
2-
sha1=cee2f3c7879783bb5f021c7db332f8a290fe3763
3-
md5=c232928479f398693bface2731387691
4-
cksum=3770559962
2+
sha1=d0e6e22c2ce36fad4bb60dbac4d6d498ceb464df
3+
md5=0b181dbb44c3cc632e724cef5081cae1
4+
cksum=4287838207
55
upstream_url=https://pypi.io/packages/source/p/pybind11/pybind11-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.2
1+
2.10.1

build/pkgs/pyrsistent/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pyrsistent-VERSION.tar.gz
2-
sha1=58f9efc4800acb6f7a083688e988187cccee2266
3-
md5=cef3da08455664bf917dcf8cd00d49a4
4-
cksum=350737156
2+
sha1=a2c5cc517a33dcfd3918d3eabf4859b8901d3913
3+
md5=23da81256b8817e123568a858bf78997
4+
cksum=1165148669
55
upstream_url=https://pypi.io/packages/source/p/pyrsistent/pyrsistent-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.18.1
1+
0.19.2

build/pkgs/pyzmq/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pyzmq-VERSION.tar.gz
2-
sha1=b31a94f504ef3104a28e64d88b7c1feafb124982
3-
md5=7de9c7bb05cc89d21e4105ec1ac7c270
4-
cksum=936855776
2+
sha1=1a2e7220d7d1b6167c14ae2cc001dfc5d9a28dde
3+
md5=f10b7c3dee2c03557e2c5d00b73dfc7f
4+
cksum=1163982926
55
upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz

build/pkgs/pyzmq/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23.2.0
1+
24.0.1
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-conf ~= 9.8b5
2+
sage-conf ~= 9.8b6
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-docbuild ~= 9.8b5
2+
sage-docbuild ~= 9.8b6
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-setup ~= 9.8b5
2+
sage-setup ~= 9.8b6
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-sws2rst ~= 9.8b5
2+
sage-sws2rst ~= 9.8b6

build/pkgs/sagelib/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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
1+
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
22

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

0 commit comments

Comments
 (0)