Skip to content

Commit ac7efcf

Browse files
authored
Merge branch 'develop' into cache_reduced_norm
2 parents b14aec8 + 94fe540 commit ac7efcf

File tree

1,918 files changed

+44990
-21900
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,918 files changed

+44990
-21900
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: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#! /bin/sh
2+
3+
SYSTEM=$(build/bin/sage-guess-package-system)
4+
5+
if [ "$SYSTEM" = "fedora" ]; then
6+
# Need to use --setopt=tsflags="" to avoid errors with gphelp
7+
dnf5 install -y pari-gp --setopt=tsflags=""
8+
9+
# Mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
10+
# by swapping the incorrectly installed OpenCL-ICD-Loader for the expected ocl-icd
11+
dnf5 -y swap --repo='fedora' OpenCL-ICD-Loader ocl-icd
12+
fi
13+
14+
eval $(build/bin/sage-print-system-package-command $SYSTEM "$@" update)
15+
eval $(build/bin/sage-print-system-package-command $SYSTEM --yes --ignore-missing install $(build/bin/sage-get-system-packages $SYSTEM $(build/bin/sage-package list :standard:)))
16+
17+
# Disable build isolation following the advice of https://mesonbuild.com/meson-python/how-to-guides/editable-installs.html#build-dependencies
18+
# Install build dependencies manually as workaround for https://github.com/astral-sh/uv/issues/1516
19+
uv venv
20+
uv pip install \
21+
meson-python \
22+
"cypari2 >=2.2.1" \
23+
"cysignals >=1.11.2, != 1.12.0" \
24+
"cython >=3.0, != 3.0.3, < 3.1.0" \
25+
"gmpy2 ~=2.1.b999" \
26+
memory_allocator \
27+
"numpy >=1.25" \
28+
jinja2 \
29+
setuptools
30+
uv sync --frozen --inexact --no-build-isolation --config-settings=builddir=build/build-$SYSTEM

0 commit comments

Comments
 (0)