Skip to content

Commit 8488b55

Browse files
dkrenndkrenn
committed
Merge branch 't/21204/sequences/k-regular-guess' into t/21343/k-regular-warning
* t/21204/sequences/k-regular-guess: (11522 commits) Trac #21204: fixup code and tests Trac #21204: cherry-pick to avoid merge conflict Trac #21319: fixup due to changes in dependencies Trac #21318: fixup due to recent changes in dependencies Updated SageMath version to 9.3 build/pkgs/fplll/spkg-install.in: Configure --without-qd if we use gcc from spkg build/pkgs/fplll/spkg-configure.m4: Add depcheck on gcc build/pkgs/ppl/spkg-configure.m4: Add depcheck on gcc build/pkgs/brial/spkg-configure.m4: Add depcheck on gcc build/pkgs/{freetype,libgd}/spkg-configure.m4: Add depcheck for gcc build/pkgs/zeromq/spkg-configure.m4: Add depcheck for gcc build/pkgs/ntl/spkg-configure.m4: Add depcheck for gcc Trac #21295 review issue 29: notice minimize vs field Trac #21295 review issue 7: document accessing coefficients Trac #21295 review issue 33: rename to number_of_zeros (as it should be) Trac #21203 review issue 4: rename to coefficient ring Trac #21295: rename to coefficient_ring Trac #21203 review issue 3: example for __getitem__ and __iter__ Trac #21203 review issue 2: extend odds in Pascal's triangle Trac #21203 review issue 1: better binary sum of digits ...
2 parents 848565f + c0519f0 commit 8488b55

File tree

7,108 files changed

+381818
-187919
lines changed

Some content is hidden

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

7,108 files changed

+381818
-187919
lines changed

‎.ci/build-docker.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ docker_build() {
2626
# Docker's --cache-from does not really work with multi-stage builds: https://github.com/moby/moby/issues/34715
2727
# So we just have to rely on the local cache.
2828
time docker build -f docker/Dockerfile \
29-
--build-arg "MAKEOPTS=${MAKEOPTS}" --build-arg "SAGE_NUM_THREADS=${SAGE_NUM_THREADS}" --build-arg "MAKEOPTS_DOCBUILD=${MAKEOPTS}" --build-arg "SAGE_NUM_THREADS_DOCBUILD=${SAGE_NUM_THREADS_DOCBUILD}" --build-arg ARTIFACT_BASE=$ARTIFACT_BASE $@
29+
--build-arg "MAKEFLAGS=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS=${SAGE_NUM_THREADS}" --build-arg "MAKEFLAGS_DOCBUILD=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS_DOCBUILD=${SAGE_NUM_THREADS_DOCBUILD}" --build-arg ARTIFACT_BASE=$ARTIFACT_BASE $@
3030
}
3131

3232
# We use a multi-stage build /docker/Dockerfile. For the caching to be
@@ -39,12 +39,21 @@ docker_build --target run-time-dependencies --tag run-time-dependencies:$DOCKER_
3939
docker_build --target build-time-dependencies --tag build-time-dependencies:$DOCKER_TAG .
4040
docker_build --target make-all --tag make-all:$DOCKER_TAG .
4141

42+
# Copy docs out of the docker image to save them into browseable GitLab artifacts
43+
container=$(docker create make-all:$DOCKER_TAG)
44+
docker cp $container:/home/sage/sage/local/share/doc/sage/html html_
45+
# GitLab's browser does not like symlinks, so we flatten them
46+
rsync html_/ html/ -a --copy-links
47+
4248
# Build the release image without build artifacts.
4349
docker_build --target sagemath --tag "$DOCKER_IMAGE_CLI" .
50+
# Tag the sagemath:$DOCKER_TAG image that CI has just built as
51+
# sagemath:$COMMIT_HASH so we can refer to it uniquely later.
52+
docker tag "$DOCKER_IMAGE_CLI" "$DOCKER_IMAGE_BINDER"
4453
# Display the layers of this image
4554
docker history "$DOCKER_IMAGE_CLI"
4655
# Build the developer image with the build artifacts intact.
47-
# Note: It's important to build the dev image last because it might be tagged as ARTIFACT_BASE.
56+
# Note: It is important to build the dev image last because it might be tagged as ARTIFACT_BASE.
4857
docker_build --target sagemath-dev --tag "$DOCKER_IMAGE_DEV" .
4958
# Display the layers of this image
5059
docker history "$DOCKER_IMAGE_DEV"

‎.ci/head-tail.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ stdbuf -i0 -o0 -e0 awk -v limit=$1 -v firstMissingNR=-1 -v offset=$OFFSET -v byt
3333
a[NR] = $0;
3434
delete a[NR-offset];
3535
printf "." > "/dev/stderr"
36+
if (/^sage-logger/){
37+
print > "/dev/stderr"
38+
}
3639
}
3740
}
3841
END {

‎.ci/push-dockerhub.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@ if [ -z "$DOCKER_USER" -o -z "$SECRET_DOCKER_PASS" ]; then
2626
else
2727
cat "$SECRET_DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin
2828
docker push ${DOCKER_NAMESPACE:-sagemath}/$1:$DOCKER_TAG
29+
30+
# For historical reasons, we also provide a -py3 tag. It's identical to the non-py3 tag.
31+
docker tag ${DOCKER_NAMESPACE:-sagemath}/$1:$DOCKER_TAG ${DOCKER_NAMESPACE:-sagemath}/$1:$DOCKER_TAG-py3
32+
docker push ${DOCKER_NAMESPACE:-sagemath}/$1:$DOCKER_TAG-py3
2933
fi

‎.ci/setup-make-parallelity.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# Source this to set CPUTHREADS (the number of apparent cores) and RAMTHREADS
44
# (free RAM divided by the maximum amount needed per thread typically)
55
# From this this script infers reasonable defaults for SAGE_NUM_THREADS and
6-
# MAKEOPTS.
6+
# MAKEFLAGS.
77

88
# We do exactly the same for CPUTHREADS_DOCBUILD, RAMTHREADS_DOCBUILD,
9-
# SAGE_NUM_THREADS_DOCBUILD, MAKEOPTS_DOCBUILD. As the docbuild needs
9+
# SAGE_NUM_THREADS_DOCBUILD, MAKEFLAGS_DOCBUILD. As the docbuild needs
1010
# substantially more RAM as of May 2018.
1111

1212
# ****************************************************************************
@@ -61,5 +61,5 @@ else
6161
export SAGE_NUM_THREADS_DOCBUILD=$RAMTHREADS_DOCBUILD
6262
fi
6363
# Set -j and -l for make (though -l is probably ignored by Sage)
64-
export MAKEOPTS="-j $SAGE_NUM_THREADS -l $((CPUTHREADS - 1)).8"
65-
export MAKEOPTS_DOCBUILD="-j $SAGE_NUM_THREADS_DOCBUILD -l $((CPUTHREADS_DOCBUILD - 1)).8"
64+
export MAKEFLAGS="-j $SAGE_NUM_THREADS -l $((CPUTHREADS - 1)).8"
65+
export MAKEFLAGS_DOCBUILD="-j $SAGE_NUM_THREADS_DOCBUILD -l $((CPUTHREADS_DOCBUILD - 1)).8"

‎.ci/test-dev.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ IMAGE="$1"
2626
# Runs $IMAGE with args and check that it terminates with a zero exit code in at most limit seconds.
2727
timed_run() {
2828
START=`date +%s`
29-
docker run -e MAKEOPTS="$MAKEOPTS_DOCBUILD" -e SAGE_NUM_THREADS="$SAGE_NUM_THREADS_DOCBUILD" "$IMAGE" "$2"
29+
docker run -e MAKEFLAGS="$MAKEFLAGS_DOCBUILD" -e SAGE_NUM_THREADS="$SAGE_NUM_THREADS_DOCBUILD" "$IMAGE" "$2"
3030
END=`date +%s`
3131
TOTAL=$((END-START))
3232
echo "Checking whether running \"$2\" was fast…"
@@ -42,4 +42,5 @@ timed_run 120 true # runs make build
4242
# The parser in Sphinx fails to parse some .py files and adds the (more
4343
# recently modified) .pyc files as dependencies instead. (Have a look the
4444
# changeset that introduced this comment for more details.)
45-
timed_run $(( 1200/$SAGE_NUM_THREADS_DOCBUILD )) make # runs make build and then make
45+
# Parts of the docbuild do not seem to be run in parallel at the moment.
46+
timed_run $(( 180 + 1200/$SAGE_NUM_THREADS_DOCBUILD )) make # runs make build and then make

‎.ci/update-env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ export DOCKER_TAG=`echo $DOCKER_TAG | tr -d '[:space:]' | tr -c '[:alnum:]_.-' '
3939
export DOCKER_IMAGE_CLI=${DOCKER_NAMESPACE:-sagemath}/sagemath:$DOCKER_TAG
4040
export DOCKER_IMAGE_DEV=${DOCKER_NAMESPACE:-sagemath}/sagemath-dev:$DOCKER_TAG
4141

42+
export DOCKER_IMAGE_BINDER="${DOCKER_NAMESPACE:-sagemath}/sagemath:${CI_COMMIT_SHA}"
43+
4244
# Seed the build cache with this image (set to source-clean to build from
4345
# scratch.)
4446
export ARTIFACT_BASE=${ARTIFACT_BASE:-$DEFAULT_ARTIFACT_BASE}

‎.circleci/before-script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
. .ci/protect-secrets.sh
1919
# Collect debug infos about the system we are running on
2020
.ci/describe-system.sh
21-
# Set MAKEOPTS and SAGE_NUM_THREADS
21+
# Set MAKEFLAGS and SAGE_NUM_THREADS
2222
. .ci/setup-make-parallelity.sh
2323

2424
# Set DOCKER_TAG according to the current branch/tag

‎.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Force LF normalization
2+
* text=auto eol=lf
3+
# except for Windows batch files
4+
*.{cmd,[cC][mM][dD]} text eol=crlf
5+
*.{bat,[bB][aA][tT]} text eol=crlf
6+
*.diff_bin binary

0 commit comments

Comments
 (0)