Skip to content

Commit 9dccb88

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into toml-fmt
2 parents 01b8ef1 + 94fe540 commit 9dccb88

File tree

1,246 files changed

+26439
-16201
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,246 files changed

+26439
-16201
lines changed

.ci/README.md

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

.ci/head-tail.sh

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

.ci/pull-gitlab.sh

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

.ci/push-dockerhub.sh

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

.ci/push-gitlab.sh

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

.ci/test-cli.sh

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

.ci/test-dev.sh

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

.ci/test-jupyter.sh

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

.devcontainer/onCreate-conda.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ conda config --env --add channels conda-forge
66
conda config --env --set channel_priority strict
77
conda update -y --all --override-channels -c conda-forge
88
conda install mamba=1 -n base -y
9-
mamba env create -y --file environment-3.11-linux.yml || mamba env update -y --file environment-3.11-linux.yml
9+
mamba env create -y --file environment-3.11-linux.yml || mamba env update --file environment-3.11-linux.yml
1010
conda init bash
1111

1212
# Build sage
13-
conda run -n sage-dev pip install --no-build-isolation -v -v -e .
13+
conda run -n sage-dev pip install --no-build-isolation -v -v -e . --config-settings=build-dir="build/conda-cp311"

.devcontainer/onCreate-meson.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ uv pip install \
2121
meson-python \
2222
"cypari2 >=2.2.1" \
2323
"cysignals >=1.11.2, != 1.12.0" \
24-
"cython >=3.0, != 3.0.3" \
24+
"cython >=3.0, != 3.0.3, < 3.1.0" \
2525
"gmpy2 ~=2.1.b999" \
2626
memory_allocator \
2727
"numpy >=1.25" \
28-
jinja2
29-
uv sync --frozen --inexact --no-build-isolation-package=sagemath
28+
jinja2 \
29+
setuptools
30+
uv sync --frozen --inexact --no-build-isolation --config-settings=builddir=build/build-$SYSTEM

0 commit comments

Comments
 (0)