Skip to content

Commit

Permalink
Merge branch 'develop' into details-in-coxeter-cat
Browse files Browse the repository at this point in the history
  • Loading branch information
fchapoton authored Aug 13, 2023
2 parents 49d17c0 + aa220c4 commit d5495ae
Show file tree
Hide file tree
Showing 415 changed files with 14,447 additions and 12,385 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ title: SageMath
abstract: SageMath is a free open-source mathematics software system.
authors:
- name: "The SageMath Developers"
version: 10.1.beta9
version: 10.1.rc0
doi: 10.5281/zenodo.593563
date-released: 2023-08-05
date-released: 2023-08-13
repository-code: "https://github.com/sagemath/sage"
url: "https://www.sagemath.org/"
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.1.beta9, Release Date: 2023-08-05
SageMath version 10.1.rc0, Release Date: 2023-08-13
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=0c03cb79520ba7f484e811aeb10ce528b3ea97d5
md5=499635417f054c55dc90c9aca9494d61
cksum=3916950255
sha1=139bcabc03fbf74d05379ff27713c7e3496fc362
md5=2631cd73e85221b77dea105e30f6165d
cksum=2003135383
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ffdd9f8e55c138555338187b059d80ceecc2abaf
50208b761995b49bf6f0702f4b9d36da24fae1a0
2 changes: 1 addition & 1 deletion build/pkgs/sage_conf/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-conf ~= 10.1b9
sage-conf ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sage_docbuild/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-docbuild ~= 10.1b9
sage-docbuild ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-setup ~= 10.1b9
sage-setup ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sage_sws2rst/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-sws2rst ~= 10.1b9
sage-sws2rst ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-standard ~= 10.1b9
sagemath-standard ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_bliss/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-bliss ~= 10.1b9
sagemath-bliss ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_categories/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-categories ~= 10.1b9
sagemath-categories ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_coxeter3/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-coxeter3 ~= 10.1b9
sagemath-coxeter3 ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_environment/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-environment ~= 10.1b9
sagemath-environment ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_mcqd/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-mcqd ~= 10.1b9
sagemath-mcqd ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_meataxe/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-meataxe ~= 10.1b9
sagemath-meataxe ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_objects/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-objects ~= 10.1b9
sagemath-objects ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_repl/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-repl ~= 10.1b9
sagemath-repl ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_sirocco/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-sirocco ~= 10.1b9
sagemath-sirocco ~= 10.1rc0
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_tdlib/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-tdlib ~= 10.1b9
sagemath-tdlib ~= 10.1rc0
2 changes: 1 addition & 1 deletion pkgs/sage-conf/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sage-conf_pypi/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sage-docbuild/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sage-setup/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sage-sws2rst/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-bliss/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-categories/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-coxeter3/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-environment/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-mcqd/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-meataxe/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-objects/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-repl/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-sirocco/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sagemath-tdlib/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
13 changes: 12 additions & 1 deletion src/.relint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,18 @@
# Keep in sync with SAGE_ROOT/src/sage/misc/replace_dot_all.py
pattern: 'from\s+sage(|[.](arith|categories|combinat|crypto|databases|data_structures|dynamics|ext|game_theory|games|geometry|graphs|groups|interfaces|manifolds|matrix|matroids|misc|modules|monoids|numerical|probability|quadratic_forms|quivers|rings|sat|schemes|sets|stats|symbolic|tensor)[a-z0-9_.]*|[.]libs)[.]all\s+import'
# imports from .all are allowed in all.py; also allow in some modules that need sage.all
filePattern: '(.*/|)(?!(all|benchmark|dev_tools|parsing|sage_eval))[^/.]*[.](py|pyx|pxi)$'
filePattern: '(.*/|)(?!(all|benchmark|dev_tools|parsing|sage_eval|explain_pickle|.*_test))[^/.]*[.](py|pyx|pxi)$'

- name: 'namespace_pkg_all_import_2: Module-level import of .all of a namespace package'
hint: |
Sage library code should not import sage.PAC.KAGE.all when sage.PAC.KAGE is an implicit
namespace package. Type import_statements("SOME_IDENTIFIER") to find a more specific import,
and rewrite the import statement as "from sage.PAC.KAGE.MODULE import ..."
or "lazy_import('sage.PAC.KAGE.MODULE', '...')".
# Keep in sync with above; but for now we ignore sage.{arith,categories}
pattern: '^import\s+sage(|[.](combinat|crypto|databases|data_structures|dynamics|ext|game_theory|games|geometry|graphs|groups|interfaces|manifolds|matrix|matroids|misc|modules|monoids|numerical|probability|quadratic_forms|quivers|rings|sat|schemes|sets|stats|symbolic|tensor)[a-z0-9_.]*|[.]libs)[.]all'
# imports from .all are allowed in all.py; also allow in some modules that need sage.all
filePattern: '(.*/|)(?!(all|benchmark|dev_tools|parsing|sage_eval|explain_pickle|.*_test))[^/.]*[.](py|pyx|pxi)$'

# Magic doctest comments

Expand Down
2 changes: 1 addition & 1 deletion src/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta9
10.1.rc0
6 changes: 3 additions & 3 deletions src/bin/sage-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# which stops "setup.py develop" from rewriting it as a Python file.
:
# This file is auto-generated by the sage-update-version script, do not edit!
SAGE_VERSION='10.1.beta9'
SAGE_RELEASE_DATE='2023-08-05'
SAGE_VERSION_BANNER='SageMath version 10.1.beta9, Release Date: 2023-08-05'
SAGE_VERSION='10.1.rc0'
SAGE_RELEASE_DATE='2023-08-13'
SAGE_VERSION_BANNER='SageMath version 10.1.rc0, Release Date: 2023-08-13'
2 changes: 1 addition & 1 deletion src/doc/en/website/root_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ <h1>Sage Documentation</h1>
<div class="cell lang"><a href='html/en/index.html'>English</a></div>
<div class="cell doc">
<div class='entry lang-en'><a href='pdf/en/a_tour_of_sage/a_tour_of_sage.pdf'>A Tour of Sage</a></div>
<div class='entry lang-en'><a href='pdf/en/tutorial/SageTutorial.pdf'>Tutorial</a></div>
<div class='entry lang-en'><a href='pdf/en/tutorial/sage_tutorial.pdf'>Tutorial</a></div>
<div class='entry lang-en'><a href='pdf/en/thematic_tutorials/thematic_tutorials.pdf'>Thematic Tutorials</a></div>
<div class='entry lang-en'><a href='pdf/en/prep/prep_tutorials.pdf'>PREP Tutorials</a></div>
<div class='entry lang-en'><a href='pdf/en/constructions/constructions.pdf'>Constructions</a></div>
Expand Down
12 changes: 6 additions & 6 deletions src/sage/algebras/hecke_algebras/cubic_hecke_base_ring.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def normalize_names_markov(names, markov_trace_version):
if markov_trace_version:
names = normalize_names(4, names)
else:
if type(names) == tuple:
if isinstance(names, tuple):
names = list(names)
if type(names) == list and len(names) > 3:
if isinstance(names, list) and len(names) > 3:
names = normalize_names(3, names[0:3])
else:
names = normalize_names(3, names)
Expand Down Expand Up @@ -641,10 +641,10 @@ def create_specialization(self, im_cubic_equation_roots, im_writhe_parameter=Non
# corresponding specialized extension ring.
# ----------------------------------------------------------------------

if type(im_cubic_equation_roots) == tuple:
if isinstance(im_cubic_equation_roots, tuple):
im_cubic_equation_roots = list(im_cubic_equation_roots)

if type(im_cubic_equation_roots) != list:
if not isinstance(im_cubic_equation_roots, list):
raise TypeError('cubic_equation_roots must be a list of three elements')

if len(im_cubic_equation_roots) != 3:
Expand Down Expand Up @@ -1226,10 +1226,10 @@ def create_specialization(self, im_cubic_equation_parameters, im_writhe_paramete
# ----------------------------------------------------------------------
# setting the base_ring according to the cubic_equation_parameters
# ----------------------------------------------------------------------
if type(im_cubic_equation_parameters) == tuple:
if isinstance(im_cubic_equation_parameters, tuple):
im_cubic_equation_parameters = list(im_cubic_equation_parameters)

if type(im_cubic_equation_parameters) != list:
if not isinstance(im_cubic_equation_parameters, list):
raise TypeError('cubic_equation_parameters must be a list of three elements')

if len(im_cubic_equation_parameters) != 3:
Expand Down
2 changes: 0 additions & 2 deletions src/sage/algebras/letterplace/free_algebra_letterplace.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ cdef MPolynomialRing_libsingular make_letterplace_ring(base_ring, blocks):
(Lexicographic term order of length 3,
Lexicographic term order of length 3)
"""
n = base_ring.ngens()
T0 = base_ring.term_order()
T = T0
cdef i
Expand Down Expand Up @@ -680,7 +679,6 @@ cdef class FreeAlgebra_letterplace(Algebra):
C = self.current_ring()
cdef FreeAlgebraElement_letterplace x
ngens = self.__ngens
degbound = self._degbound
cdef list G = [C(x._poly) for x in g]
from sage.groups.perm_gps.permgroup_named import CyclicPermutationGroup
CG = CyclicPermutationGroup(C.ngens())
Expand Down
Loading

0 comments on commit d5495ae

Please sign in to comment.