Skip to content

Commit 95f7f68

Browse files
dkrenndkrenn
committed
Merge branch 'u/dkrenn/sequences/k-regular-guess' into u/dkrenn/k-regular-warning
* u/dkrenn/sequences/k-regular-guess: (12501 commits) test RuntimeError no invertible matrix add comment and ref to #35748 remove W293 blank line contains whitespace fix docstring (LaTeX) fix whitespaces better handling of n_max add another test add another test fixup n_max fix left/right issue when bootstraping guessing more consistent naming in DEBUG output consequently rename to linear_combination simplify code by removing variables make NoLinearCombination a RuntimeError remove unneeded import Apply suggestions from code review Apply suggestions from code review write error message rename, describe and test max_exponent fixup catching NoLinearCombination exception ...
2 parents 4af416c + a98c32d commit 95f7f68

File tree

6,197 files changed

+382308
-185094
lines changed

Some content is hidden

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

6,197 files changed

+382308
-185094
lines changed

‎.circleci/before-script.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.circleci/config.yml

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎.codecov.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# https://docs.codecov.com/docs/pull-request-comments#disable-comment
2+
comment: false
3+
# https://docs.codecov.com/docs/codecovyml-reference#codecov
4+
codecov:
5+
require_ci_to_pass: false
6+
# https://docs.codecov.com/docs/commit-status
7+
coverage:
8+
status:
9+
project:
10+
default:
11+
target: auto
12+
threshold: 0%
13+
base: auto
14+
patch:
15+
default:
16+
target: auto
17+
threshold: 0%
18+
base: auto

‎.devcontainer/devcontainer.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/debian
3+
{
4+
"name": "Conda",
5+
"image": "mcr.microsoft.com/vscode/devcontainers/base:0-bullseye",
6+
7+
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
8+
"remoteUser": "vscode",
9+
10+
// Setup conda environment
11+
"onCreateCommand": ".devcontainer/onCreate-conda.sh",
12+
13+
// Install additional features.
14+
"features": {
15+
// For config options, see https://github.com/devcontainers/features/tree/main/src/conda
16+
"ghcr.io/devcontainers/features/conda": {
17+
"version": "latest",
18+
"addCondaForge": "true"
19+
}
20+
},
21+
"customizations": {
22+
"vscode": {
23+
"extensions": [
24+
"guyskk.language-cython",
25+
"ms-python.isort",
26+
"ms-toolsai.jupyter",
27+
"ms-python.vscode-pylance",
28+
"ms-python.pylint",
29+
"ms-python.python",
30+
"lextudio.restructuredtext",
31+
"trond-snekvik.simple-rst"
32+
]
33+
}
34+
}
35+
}

‎.devcontainer/develop-docker-computop/devcontainer.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "computop/sage Docker",
4+
"image": "computop/sage",
5+
"containerEnv": {
6+
"MAKE": "make -j4"
7+
},
8+
// Install build tools, get rid of sourcing /sage/activate in non-login shells.
9+
// libgmp.a is broken and leads to a build failure of ecm.
10+
"onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
11+
// Do not run configure within a sage-env (see #29485).
12+
// The pari package is broken in the computop/sage 9.5 image, need to reinstall.
13+
// Also libnauty is broken.
14+
"updateContentCommand": "make configure && (export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && unset CFLAGS LDFLAGS CXXFLAGS CPATH LIBRARY_PATH && ./configure --prefix=/sage/local --with-sage-venv) && make pari-clean nauty-clean build V=0",
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}

‎.devcontainer/downstream-archlinux-latest/devcontainer.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "archlinux:latest downstream Sage",
4+
"image": "archlinux:latest",
5+
// Create an empty bashrc to avoid the error "No such file or directory" when opening a terminal.
6+
"onCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/onCreate.sh && touch ~/.bashrc",
7+
// There's no SAGE_LOCAL, so remove the symlink 'prefix'.
8+
"updateContentCommand": "rm -f prefix && ln -sf /usr venv",
9+
"extensions": [
10+
"ms-python.python"
11+
]
12+
}

‎.devcontainer/downstream-conda-forge-latest/devcontainer.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "condaforge/mambaforge:latest downstream Sage",
4+
"image": "condaforge/mambaforge:latest",
5+
// Install Sage from the conda-forge package.
6+
"onCreateCommand": "mamba install --yes sage",
7+
// * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
8+
// - it bootstraps and configures the Sage distribution,
9+
// - thus, the script ``./sage`` and the symlinks ``prefix``, ``venv`` are set as expected,
10+
// - the source tree is prepared for rebuilding Sage based from the source tree on
11+
// top of the existing installation from the Docker image.
12+
// - however, it does not start the build.
13+
// * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
14+
// into their projects.
15+
"updateContentCommand": "if [ -d pkgs/sagemath-standard ]; then make configure && ln -sf $CONDA_PREFIX venv; else echo 'Edit .devcontainer/devcontainer.json (updateContentCommand) to run project-specific startup commands'; fi",
16+
"extensions": [
17+
"ms-python.python"
18+
]
19+
}

‎.devcontainer/downstream-docker-cocalc/devcontainer.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "CoCalc Docker",
4+
"image": "sagemathinc/cocalc",
5+
"containerEnv": {
6+
"MAKE": "make -j4"
7+
},
8+
// libgmp.a is broken and leads to a build failure of ecm.
9+
"onCreateCommand": ".devcontainer/onCreate.sh && rm -f /usr/local/sage/local/lib/libgmp.a",
10+
// * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
11+
// - it bootstraps the Sage distribution,
12+
// - sets the symlink ``venv`` as expected,
13+
// * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
14+
// into their projects.
15+
"updateContentCommand": "if [ -d pkgs/sagemath-standard ]; then make configure && ./configure --enable-build-as-root --prefix=/usr/local/sage/local --with-sage-venv; else echo 'Edit .devcontainer/devcontainer.json (updateContentCommand) to run project-specific startup commands'; fi",
16+
"extensions": [
17+
"ms-python.python"
18+
]
19+
}

‎.devcontainer/downstream-docker-computop/devcontainer.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "computop/sage Docker",
4+
"image": "computop/sage",
5+
"containerEnv": {
6+
"MAKE": "make -j4"
7+
},
8+
// Install build tools, get rid of sourcing /sage/activate in non-login shells.
9+
// libgmp.a is broken and leads to a build failure of ecm.
10+
"onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
11+
// Do not run configure within a sage-env (see #29485).
12+
// The pari package is broken in the computop/sage 9.5 image, need to reinstall.
13+
// Also libnauty is broken.
14+
"updateContentCommand": "make configure && (export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && unset CFLAGS LDFLAGS CXXFLAGS CPATH LIBRARY_PATH && ./configure --prefix=/sage/local --with-sage-venv)",
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}

‎.devcontainer/onCreate-conda.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Do not keep running on errors
2+
set -e
3+
4+
# Create conda environment
5+
./bootstrap-conda
6+
conda install mamba -n base -c conda-forge -y
7+
mamba env create --file src/environment-dev.yml || mamba env update --file src/environment-dev.yml
8+
conda init bash
9+
10+
# Build sage
11+
conda run -n sage-dev ./bootstrap
12+
conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
13+
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
14+
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src

0 commit comments

Comments
 (0)