Skip to content

Commit 4af416c

Browse files
committed
Merge branch 't/21204/sequences/k-regular-guess' into t/21343/k-regular-warning
* t/21204/sequences/k-regular-guess: (2107 commits) Follow-up from Trac #21325 review comment 19: shift_left+right: test equality Trac #21325 review comment 19: shift_left, shift_right Trac #21325 review comment 18: deal with remaining block vectors Trac #21325 review comment 17: simpler (more readable) construction of block matrix Trac #21325 review comment 14+15: rewrite construction dict Trac #21325 review comment 13: use .linear representation in examples partial_sum Trac #21325 review comment 12: fixup docstring partial_sums Trac #21325 review comment 11: simplify construction and code for left vector Trac #21325 review comment 9: add comment in inner loop Trac #21325 review comment 8: more rewriting to use block structure Trac #21325 review comment 8: rewrite subsequences to use block matrices Trac #21325 review comment 7: rewrite dict-constrution Trac #21325 review comment 6: test matrices of output Trac #21325 review comment 4: explicitly state vector in example Trac #21325 review comment 5: use .linear_representation Trac #21325 review comment 4: simplify lineare representation of example-sequence (subsequence) Trac #21325 review comment 3: revise description of parameter b of subsequence Trac #21325 review comment 2: PEP8 in examples of pad_right Trac #21325 review comment 1: fix docstring formatting in pad_right Updated SageMath version to 9.4 ...
2 parents 9b59022 + 3c634df commit 4af416c

File tree

1,472 files changed

+89675
-44076
lines changed

Some content is hidden

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

1,472 files changed

+89675
-44076
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
MAKE: make -j8
1414
SAGE_NUM_THREADS: 3
1515
CYGWIN: winsymlinks:native
16-
CONFIGURE_ARGS: --enable-experimental-packages --enable-download-from-upstream-url --enable-fat-binary
16+
EXTRA_CONFIGURE_ARGS: --enable-fat-binary
1717
SAGE_LOCAL: /opt/sage-${{ github.sha }}
1818

1919
jobs:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
MAKE: make -j8
1414
SAGE_NUM_THREADS: 3
1515
CYGWIN: winsymlinks:native
16-
CONFIGURE_ARGS: --enable-experimental-packages --enable-download-from-upstream-url --enable-fat-binary
16+
EXTRA_CONFIGURE_ARGS: --enable-fat-binary
1717
SAGE_LOCAL: /opt/sage-${{ github.sha }}
1818

1919
jobs:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install relint
3131
run: pip install tox relint
3232
- name: Lint using relint
33-
run: tox -e relint src/
33+
run: tox -e relint src/sage/
3434
lint-pyright:
3535
name: Static type check with pyright
3636
runs-on: ubuntu-latest

.github/workflows/tox-experimental.yml

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 6
4040
matrix:
41-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
41+
# This list is different from the one in tox.yml:
42+
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
43+
tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-gcc_spkg]
4244
tox_packages_factor: [maximal]
4345
targets_pattern: [0-g, h-o, p, q-z]
4446
env:
@@ -112,54 +114,35 @@ jobs:
112114
fail-fast: false
113115
max-parallel: 3
114116
matrix:
115-
tox_system_factor: [homebrew-macos, conda-forge-macos]
116-
tox_packages_factor: [minimal, standard]
117+
tox_system_factor: [homebrew-macos, conda-forge-macos, homebrew-macos-python3_xcode]
118+
tox_packages_factor: [maximal]
117119
# As of 2021-03, default xcode is 12.4
118120
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
119121
xcode_version_factor: [default]
122+
targets_pattern: [0-g, h-o, p, q-z]
120123
os: [ macos-10.15, macos-11.0 ]
121124
include:
122125
# Test xcode 11.7 only on macos-10.15
123126
- tox_system_factor: homebrew-macos
124-
tox_packages_factor: minimal
127+
tox_packages_factor: maximal
125128
xcode_version_factor: 11.7
129+
targets_pattern: 0-g
126130
os: macos-10.15
127131
- tox_system_factor: homebrew-macos
128-
tox_packages_factor: standard
132+
tox_packages_factor: maximal
129133
xcode_version_factor: 11.7
134+
targets_pattern: h-o
130135
os: macos-10.15
131-
# python3_xcode is only accepted if enough packages are available from the system
132-
# --> to test "minimal", we will need https://trac.sagemath.org/ticket/30949
133-
- tox_system_factor: homebrew-macos-python3_xcode
134-
tox_packages_factor: standard
136+
- tox_system_factor: homebrew-macos
137+
tox_packages_factor: maximal
135138
xcode_version_factor: 11.7
139+
targets_pattern: p
136140
os: macos-10.15
137-
- tox_system_factor: homebrew-macos-python3_xcode
138-
tox_packages_factor: standard
139-
xcode_version_factor: default
141+
- tox_system_factor: homebrew-macos
142+
tox_packages_factor: maximal
143+
xcode_version_factor: 11.7
144+
targets_pattern: q-z
140145
os: macos-10.15
141-
- tox_system_factor: homebrew-macos-python3_xcode
142-
tox_packages_factor: standard
143-
xcode_version_factor: default
144-
os: macos-11.0
145-
- tox_system_factor: homebrew-macos-python3_xcode-nokegonly
146-
tox_packages_factor: standard
147-
xcode_version_factor: default
148-
os: macos-11.0
149-
# likewise for python3_pythonorg
150-
- tox_system_factor: homebrew-macos-python3_pythonorg
151-
tox_packages_factor: standard
152-
xcode_version_factor: default
153-
os: macos-11.0
154-
# conda-forge-macos-environment
155-
- tox_system_factor: conda-forge-macos
156-
tox_packages_factor: environment
157-
xcode_version_factor: default
158-
os: macos-11.0
159-
- tox_system_factor: conda-forge-macos
160-
tox_packages_factor: environment-optional
161-
xcode_version_factor: default
162-
os: macos-11.0
163146
env:
164147
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
165148
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}

.github/workflows/tox-optional.yml

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 6
4040
matrix:
41-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
41+
# This list is different from the one in tox.yml:
42+
# Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
43+
tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-gcc_spkg]
4244
tox_packages_factor: [maximal]
4345
targets_pattern: [0-g, h-o, p, q-z]
4446
env:
@@ -114,54 +116,35 @@ jobs:
114116
fail-fast: false
115117
max-parallel: 3
116118
matrix:
117-
tox_system_factor: [homebrew-macos, conda-forge-macos]
118-
tox_packages_factor: [minimal, standard]
119+
tox_system_factor: [homebrew-macos, conda-forge-macos, homebrew-macos-python3_xcode]
120+
tox_packages_factor: [maximal]
119121
# As of 2021-03, default xcode is 12.4
120122
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
121123
xcode_version_factor: [default]
124+
targets_pattern: [0-g, h-o, p, q-z]
122125
os: [ macos-10.15, macos-11.0 ]
123126
include:
124127
# Test xcode 11.7 only on macos-10.15
125128
- tox_system_factor: homebrew-macos
126-
tox_packages_factor: minimal
129+
tox_packages_factor: maximal
127130
xcode_version_factor: 11.7
131+
targets_pattern: 0-g
128132
os: macos-10.15
129133
- tox_system_factor: homebrew-macos
130-
tox_packages_factor: standard
134+
tox_packages_factor: maximal
131135
xcode_version_factor: 11.7
136+
targets_pattern: h-o
132137
os: macos-10.15
133-
# python3_xcode is only accepted if enough packages are available from the system
134-
# --> to test "minimal", we will need https://trac.sagemath.org/ticket/30949
135-
- tox_system_factor: homebrew-macos-python3_xcode
136-
tox_packages_factor: standard
138+
- tox_system_factor: homebrew-macos
139+
tox_packages_factor: maximal
137140
xcode_version_factor: 11.7
141+
targets_pattern: p
138142
os: macos-10.15
139-
- tox_system_factor: homebrew-macos-python3_xcode
140-
tox_packages_factor: standard
141-
xcode_version_factor: default
143+
- tox_system_factor: homebrew-macos
144+
tox_packages_factor: maximal
145+
xcode_version_factor: 11.7
146+
targets_pattern: q-z
142147
os: macos-10.15
143-
- tox_system_factor: homebrew-macos-python3_xcode
144-
tox_packages_factor: standard
145-
xcode_version_factor: default
146-
os: macos-11.0
147-
- tox_system_factor: homebrew-macos-python3_xcode-nokegonly
148-
tox_packages_factor: standard
149-
xcode_version_factor: default
150-
os: macos-11.0
151-
# likewise for python3_pythonorg
152-
- tox_system_factor: homebrew-macos-python3_pythonorg
153-
tox_packages_factor: standard
154-
xcode_version_factor: default
155-
os: macos-11.0
156-
# conda-forge-macos-environment
157-
- tox_system_factor: conda-forge-macos
158-
tox_packages_factor: environment
159-
xcode_version_factor: default
160-
os: macos-11.0
161-
- tox_system_factor: conda-forge-macos
162-
tox_packages_factor: environment-optional
163-
xcode_version_factor: default
164-
os: macos-11.0
165148
env:
166149
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
167150
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}

.github/workflows/tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fail-fast: false
3939
max-parallel: 20
4040
matrix:
41-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
41+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
4242
tox_packages_factor: [minimal, standard]
4343
env:
4444
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.gitignore

Lines changed: 71 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
*.pyc
1+
## We use this file both as .gitignore and .dockerignore,
2+
## which have different semantics.
3+
24
/dist
35
/local
46
/logs
@@ -23,17 +25,31 @@
2325
/src/environment.yml
2426
/src/environment-optional.yml
2527

28+
/src/setup.cfg
29+
/src/requirements.txt
30+
/src/pyproject.toml
31+
/src/Pipfile
32+
/src/Pipfile.lock
33+
/Pipfile
34+
/Pipfile.lock
35+
2636
# Various editors
2737
*~
38+
**/*~
2839

2940
# Emacs
3041
\#*\#
42+
**/\#*\#
3143
.\#*
44+
**/.\#*
3245

3346
# Vim
3447
*.swp
48+
**/*.swp
3549
*.swo
50+
**/*.swo
3651
*.swn
52+
**/*.swn
3753
*.un~
3854
.netrwhist
3955

@@ -43,6 +59,7 @@
4359

4460
# VSCode
4561
.vscode/*
62+
**/.vscode/*
4663

4764
# XCode
4865
xcuserdata/
@@ -53,6 +70,7 @@ xcuserdata/
5370
.metadata
5471
*.tmp
5572
*.bak
73+
**/*.bak
5674
*.swp
5775
*~.nib
5876
.classpath
@@ -64,6 +82,7 @@ xcuserdata/
6482

6583
# OSX specific temporary files
6684
.DS_Store
85+
**/.DS_Store
6786
._*
6887
.AppleDouble
6988
.LSOverride
@@ -90,46 +109,69 @@ gitlab-build-docker.log
90109

91110
# Byte-compiled / optimized / DLL files
92111
__pycache__/
112+
**/__pycache__
93113
*.py[cod]
114+
**/*.py[cod]
94115
*$py.class
95116

117+
# Generated by sage_setup.autogen
118+
/src/sage/ext/interpreters
119+
96120
# Generated Cython files
97121
*.so
98-
src/sage/**/*.c
99-
src/sage/**/*.cpp
100-
src/sage/modular/arithgroup/farey_symbol.h
101-
!src/sage/cpython/debugimpl.c
102-
!src/sage/graphs/base/boost_interface.cpp
103-
!src/sage/graphs/cliquer/cl.c
104-
!src/sage/graphs/graph_decompositions/sage_tdlib.cpp
105-
!src/sage/libs/eclib/wrap.cpp
106-
!src/sage/misc/inherit_comparison_impl.c
107-
!src/sage/modular/arithgroup/farey.cpp
108-
!src/sage/modular/arithgroup/sl2z.cpp
109-
!src/sage/rings/bernmm/bern_modp.cpp
110-
!src/sage/rings/bernmm/bern_modp_util.cpp
111-
!src/sage/rings/bernmm/bern_rat.cpp
112-
!src/sage/rings/bernmm/bernmm-test.cpp
113-
!src/sage/rings/padics/transcendantal.c
114-
!src/sage/rings/polynomial/weil/power_sums.c
115-
!src/sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp
116-
!src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp
117-
!src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_zn_poly.cpp
118-
!src/sage/stats/distributions/dgs_bern.c
119-
!src/sage/stats/distributions/dgs_gauss_dp.c
120-
!src/sage/stats/distributions/dgs_gauss_mp.c
122+
**/*.so
123+
/src/sage/**/*.c
124+
/src/sage/**/*.cpp
125+
/src/sage/modular/arithgroup/farey_symbol.h
126+
!/src/sage/cpython/debugimpl.c
127+
!/src/sage/graphs/base/boost_interface.cpp
128+
!/src/sage/graphs/cliquer/cl.c
129+
!/src/sage/graphs/graph_decompositions/sage_tdlib.cpp
130+
!/src/sage/libs/eclib/wrap.cpp
131+
!/src/sage/libs/linkages/padics/relaxed/flint_helper.c
132+
!/src/sage/misc/inherit_comparison_impl.c
133+
!/src/sage/modular/arithgroup/farey.cpp
134+
!/src/sage/modular/arithgroup/sl2z.cpp
135+
!/src/sage/rings/bernmm/bern_modp.cpp
136+
!/src/sage/rings/bernmm/bern_modp_util.cpp
137+
!/src/sage/rings/bernmm/bern_rat.cpp
138+
!/src/sage/rings/bernmm/bernmm-test.cpp
139+
!/src/sage/rings/padics/transcendantal.c
140+
!/src/sage/rings/polynomial/weil/power_sums.c
141+
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp
142+
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp
143+
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_zn_poly.cpp
144+
!/src/sage/stats/distributions/dgs_bern.c
145+
!/src/sage/stats/distributions/dgs_gauss_dp.c
146+
!/src/sage/stats/distributions/dgs_gauss_mp.c
121147
/src/cython_debug
122148

123149
# Temporary build files
124150
build/temp.*/
125151
build/bin/sage-build-env-config
126152

153+
# Generated files in the top-level source trees
154+
/pkgs/*/build
155+
/pkgs/*/dist
156+
/pkgs/*/MANIFEST
157+
/pkgs/*/*.egg-info
158+
/pkgs/*/.tox
159+
160+
# same for old locations - before Trac #31577
127161
/build/pkgs/*/src/build
128162
/build/pkgs/*/src/dist
129163
/build/pkgs/*/src/MANIFEST
130164
/build/pkgs/*/src/*.egg-info
131165
/build/pkgs/*/src/.tox
132166

167+
# Generated by docbuild
168+
/src/doc/en/reference/*/sage
169+
/src/doc/en/reference/sage
170+
/src/doc/en/reference/spkg/*.rst
171+
/src/doc/output
172+
/src/doc/en/installation/*.txt
173+
/src/doc/en/reference/repl/*.txt
174+
133175
# Distribution / packaging
134176
src/*.egg-info/
135177
/src/.cython_version
@@ -152,5 +194,10 @@ src/venv.bak/
152194

153195
# tox generated files
154196
/.tox
197+
/build/.tox
198+
**/.tox
155199
/prefix
200+
201+
# git worktree
156202
worktree*
203+
**/worktree*

.homebrew-build-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ for l in readline bzip2 ntl; do
3131
CPATH="$HOMEBREW/opt/$l/include:$CPATH"
3232
fi
3333
done
34-
for l in "gcc/lib/gcc/10 gcc/lib/gcc/9"; do
34+
for l in "gcc/lib/gcc/11 gcc/lib/gcc/10 gcc/lib/gcc/9"; do
3535
if [ -d "$HOMEBREW/opt/$l" ]; then
3636
LIBRARY_PATH="$HOMEBREW/opt/$l:$LIBRARY_PATH"
3737
break

.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.3",
5-
"version": "9.3",
4+
"title": "sagemath/sage: 9.4",
5+
"version": "9.4",
66
"upload_type": "software",
7-
"publication_date": "2021-05-09",
7+
"publication_date": "2021-08-22",
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.3",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

0 commit comments

Comments
 (0)