Skip to content

Commit 9ebadcf

Browse files
author
Matthias Koeppe
committed
Merge tag '9.8.beta6' into t/32664/add_sage_rings_abc_finitefield__deprecate_is_finitefield
SageMath version 9.8.beta6, Release Date: 2022-12-21
2 parents 9f4d1c4 + 2114066 commit 9ebadcf

File tree

254 files changed

+2404
-2018
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

+2404
-2018
lines changed

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

Lines changed: 1044 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 7 additions & 5 deletions
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

Lines changed: 4 additions & 3 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 0 additions & 50 deletions
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

Lines changed: 3 additions & 3 deletions

VERSION.txt

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
#

0 commit comments

Comments
 (0)