Skip to content

Commit 26f1d0d

Browse files
tobiasdieztobiasdiez
authored
Merge branch 'develop' into python38
2 parents eed0593 + 7404764 commit 26f1d0d

File tree

316 files changed

+10306
-6747
lines changed

Some content is hidden

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

316 files changed

+10306
-6747
lines changed

‎.github/workflows/ci-linux.yml

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ env:
2929
TARGETS: build doc-html
3030
TARGETS_OPTIONAL: ptest
3131

32+
permissions:
33+
packages: write
34+
3235
jobs:
3336

3437
standard-pre:

‎.github/workflows/doc-publish.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Triggers after the documentation build has finished,
1+
# Triggers after the documentation build has finished,
22
# taking the artifact and uploading it to netlify
33
name: Publish documentation
44

@@ -47,7 +47,7 @@ jobs:
4747
});
4848
var fs = require('fs');
4949
fs.writeFileSync('${{github.workspace}}/docs.zip', Buffer.from(download.data));
50-
50+
5151
- name: Extract docs
5252
run: unzip docs.zip -d docs && unzip docs/docs.zip -d docs/docs
5353

@@ -72,9 +72,8 @@ jobs:
7272
header: preview-comment
7373
recreate: true
7474
message: |
75-
[Documentation preview for this PR](${{ steps.deploy-netlify.outputs.NETLIFY_URL }}) is ready! :tada:
76-
Built with commit: ${{ steps.source-run-info.outputs.sourceHeadSha }}
77-
75+
[Documentation preview for this PR](${{ steps.deploy-netlify.outputs.NETLIFY_URL }}) (built with commit ${{ steps.source-run-info.outputs.sourceHeadSha }}) is ready! :tada:
76+
7877
- name: Update deployment status PR check
7978
uses: myrotvorets/[email protected]
8079
if: ${{ always() }}

‎.github/workflows/docker.yml

-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ jobs:
142142
repository: ${{ inputs.sage_repo }}
143143
ref: ${{ inputs.sage_ref }}
144144
fetch-depth: 10000
145-
- name: fetch tags
146-
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
147145
- name: free disk space
148146
run: |
149147
df -h

‎.zenodo.json

+4-4
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: 10.0",
5-
"version": "10.0",
4+
"title": "sagemath/sage: 10.1.beta0",
5+
"version": "10.1.beta0",
66
"upload_type": "software",
7-
"publication_date": "2023-05-20",
7+
"publication_date": "2023-05-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/10.0",
18+
"identifier": "https://github.com/sagemath/sage/tree/10.1.beta0",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.0, Release Date: 2023-05-20
1+
SageMath version 10.1.beta0, Release Date: 2023-05-22

‎build/pkgs/4ti2/checksums.ini

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tarball=4ti2-VERSION.tar.gz
2-
sha1=9a9a6913bcd52b667355a7df7fa954ca101054cb
3-
md5=90def0d6b01a0247e439356777467497
4-
cksum=439147307
2+
sha1=3d41f30ea3ef94c293eae30c087494269fc1a6b9
3+
md5=1215872325ddfc561865ecb22b2bccb2
4+
cksum=2439180289
5+
upstream_url=https://github.com/4ti2/4ti2/releases/download/Release_1_6_10/4ti2-1.6.10.tar.gz

‎build/pkgs/4ti2/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.7.p0
1+
1.6.10

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=7460b5a298a1d6e1e22816174a89526fd3baeb6f
3-
md5=adab6d06997313cc52c8da7dfbcf94b2
4-
cksum=2723491418
2+
sha1=e55fd192510499ab59847906bf0abc0e1776aecb
3+
md5=7adfc7ea92837b419c9cf91085b4c0c2
4+
cksum=2479564476

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8476c4695880ff35d9e534e916d2841a67cba0de
1+
8455792fc708dc9b848e9d084e96a6a890bca822

‎build/pkgs/libgd/SPKG.rst

+1-6
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,4 @@ Upstream Contact
2323

2424
- https://libgd.github.io
2525
- Pierre Joye (http://blog.thepimp.net)
26-
- http://libgd.bitbucket.org/
27-
28-
Special Update/Build Instructions
29-
---------------------------------
30-
31-
See spkg-src script.
26+
- https://github.com/libgd/libgd

‎build/pkgs/libgd/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=libgd-VERSION.tar.xz
2-
sha1=dddf5e9d25cb0b20b8642d5cbcfad67f8903532f
3-
md5=0ee844caca06bb02bf4b4dabdfab4fb1
4-
cksum=902217083
2+
sha1=7ce6ecb5aed26c08246a37b6351c886ab4b51ca2
3+
md5=7a58b54d375eda236414201252a0ee3c
4+
cksum=1360697583
55
upstream_url=https://github.com/libgd/libgd/releases/download/gd-VERSION/libgd-VERSION.tar.xz

‎build/pkgs/libgd/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
libpng freetype xz
1+
libpng xz
22

33
# xz needed to unpack tarball when sage-bootstrap-python is Python < 3.3
44
----------

‎build/pkgs/libgd/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.2
1+
2.3.3

‎build/pkgs/libgd/spkg-install.in

+6-18
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,13 @@ cd src
22

33
export CFLAGS="-g $CFLAGS"
44

5-
if [ "$UNAME" = "CYGWIN" ]; then
6-
# Compiling with vpx support creates a broken library in some cases
7-
# because the vpx package itself is broken on some older Cygwin versions;
8-
# we don't need this feature so safer to just disable
9-
# https://github.com/sagemath/sage/issues/27970
10-
LIBGD_CONFIGURE="--without-vpx $LIBGD_CONFIGURE"
11-
fi
12-
if [ -n "$SAGE_FREETYPE_PREFIX" ]; then
13-
LIBGD_CONFIGURE="--with-freetype=$SAGE_FREETYPE_PREFIX $LIBGD_CONFIGURE"
14-
else
15-
LIBGD_CONFIGURE="--with-freetype=yes $LIBGD_CONFIGURE"
16-
fi
17-
18-
# We explicitly disable X and fontconfig support, since (1) X is not a SAGE dependency,
19-
# and (2) the gd build fails on a lot of OS X PPC machines when X is enabled.
20-
# Also, libgd will try to link against system libavif/libvmaf and fail
21-
# on Fedora 34
5+
# We explicitly disable X, fontconfig, and support of various formats/libraries.
6+
# We only need png.
7+
# see https://github.com/libgd/libgd/blob/master/configure.ac
228
sdh_configure --without-jpeg --without-xpm --without-x --without-fontconfig \
23-
--without-avif \
9+
--without-avif --without-freetype --without-raqm --without-liq \
10+
--without-tiff --without-webp --without-heif \
11+
--disable-gd-formats \
2412
--with-zlib="$SAGE_LOCAL" $LIBGD_CONFIGURE
2513
sdh_make
2614
sdh_make_install

‎build/pkgs/libgd/spkg-src

-34
This file was deleted.

‎build/pkgs/openblas/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=openblas-VERSION.tar.gz
2-
sha1=b052d196ad694b29302e074b3eb8cc66745f6e2f
3-
md5=ffb6120e2309a2280471716301824805
4-
cksum=241092070
2+
sha1=6b781727c7b95850ae4a3eb0a391492eb4f3e780
3+
md5=115634b39007de71eb7e75cf7591dfb2
4+
cksum=2485407229
55
upstream_url=https://github.com/xianyi/OpenBLAS/archive/vVERSION.tar.gz

‎build/pkgs/openblas/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.21
1+
0.3.23

‎build/pkgs/sage_conf/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-conf ~= 10.0
2+
sage-conf ~= 10.1b0

‎build/pkgs/sage_docbuild/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-docbuild ~= 10.0
2+
sage-docbuild ~= 10.1b0

‎build/pkgs/sage_setup/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-setup ~= 10.0
2+
sage-setup ~= 10.1b0

‎build/pkgs/sage_sws2rst/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-sws2rst ~= 10.0
2+
sage-sws2rst ~= 10.1b0

‎build/pkgs/sagelib/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagelib ~= 10.0
2+
sagelib ~= 10.1b0

‎build/pkgs/sagemath_categories/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-categories ~= 10.0
2+
sagemath-categories ~= 10.1b0

‎build/pkgs/sagemath_environment/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-environment ~= 10.0
2+
sagemath-environment ~= 10.1b0

‎build/pkgs/sagemath_objects/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-objects ~= 10.0
2+
sagemath-objects ~= 10.1b0

‎build/pkgs/sagemath_repl/install-requires.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-repl ~= 10.0
2+
sagemath-repl ~= 10.1b0

‎pkgs/sage-conf/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.0
1+
10.1.beta0

‎pkgs/sage-conf_pypi/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.0
1+
10.1.beta0

‎pkgs/sage-docbuild/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.0
1+
10.1.beta0

‎pkgs/sage-setup/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.0
1+
10.1.beta0

‎pkgs/sage-sws2rst/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.0
1+
10.1.beta0

‎pkgs/sagemath-categories/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.0
1+
10.1.beta0

‎pkgs/sagemath-categories/tox.ini

+53-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# To build and test in the tox environment:
22
#
3-
# ./sage -sh -c '(cd pkgs/sagemath-categories && tox -v -v -v -e sagepython)'
3+
# make SAGE_WHEELS=yes sagemath_categories-build-deps sagemath_repl && ./sage -sh -c '(cd pkgs/sagemath-categories && SAGE_NUM_THREADS=8 tox -v -v -v -e sagepython-sagewheels-nopypi-norequirements)'
44
#
5-
# To test interactively:
5+
# After this, to test interactively:
66
#
7-
# pkgs/sagemath-categories/.tox/sagepython/bin/python
7+
# pkgs/sagemath-categories/.tox/sagepython-sagewheels-nopypi-norequirements/bin/sage
88
#
99
[tox]
1010
envlist =
11-
sagepython-norequirements
11+
sagepython-sagewheels-nopypi-norequirements
1212

13-
[testenv]
14-
deps =
15-
!norequirements: -rrequirements.txt
16-
# tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576
17-
sagemath-repl
18-
19-
extras = test
13+
requires =
14+
# Auto-provision a modern tox.
15+
# [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
16+
tox>=4.2
2017

18+
[pkgenv]
19+
# Environment in which to build the sdist.
20+
# https://tox.wiki/en/latest/upgrading.html#packaging-environments
2121
passenv =
2222
# Variables set by .homebrew-build-env
2323
CPATH
@@ -32,36 +32,73 @@ passenv =
3232
sagewheels: SAGE_SPKG_WHEELS
3333

3434
setenv =
35-
# Sage scripts such as sage-runtests like to use $HOME/.sage
36-
HOME={envdir}
3735
# We supply pip options by environment variables so that they
3836
# apply both to the installation of the dependencies and of the package
3937
sagewheels: PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
4038
nopypi: PIP_NO_INDEX=true
4139

40+
[testenv]
41+
deps =
42+
!norequirements: -rrequirements.txt
43+
44+
extras = test
45+
46+
passenv = {[pkgenv]passenv}
47+
48+
setenv = {[pkgenv]setenv}
49+
# Sage scripts such as sage-runtests like to use $HOME/.sage
50+
HOME={envdir}
51+
4252
allowlist_externals =
4353
bash
4454

4555
commands =
46-
# Beware of the treacherous non-src layout. "./sage/" shadows the install sage package.
56+
# Beware of the treacherous non-src layout. "./sage/" shadows the installed sage package.
4757
{envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.cpython.builtin_types, sage.cpython.cython_metaclass, sage.cpython.debug, sage.structure.all, sage.categories.all'
4858

4959
# Test that importing sage.categories.all initializes categories
5060
{envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); from sage.categories.all import *; SimplicialComplexes(); FunctionFields()'
5161

52-
bash -c 'cd {temp_dir} && SAGE_SRC=$(python -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --initial --environment=sage.all__sagemath_categories --optional=sage $SAGE_SRC/sage/structure || echo "(lots of doctest failures are expected)"'
62+
bash -c 'cd $(python -c "import sys; \"\" in sys.path and sys.path.remove(\"\"); from sage.env import SAGE_LIB; print(SAGE_LIB)") \
63+
&& sage-runtests -p --initial --environment=sage.all__sagemath_categories --optional=sage sage/structure || echo "(lots of doctest failures are expected)"'
64+
65+
[testenv:.tox]
66+
# Allow access to PyPI for auto-provisioning a suitable tox version
67+
passenv =
68+
setenv = PIP_NO_INDEX=false
69+
70+
[testenv:.pkg-sagepython]
71+
# Environment in which to build the sdist.
72+
# inherits from [pkgenv] - https://tox.wiki/en/latest/upgrading.html#packaging-environments
73+
basepython = {env:SAGE_VENV}/bin/python3
74+
75+
[testenv:.pkg-sagepython-sagewheels-nopypi]
76+
passenv = {[pkgenv]passenv}
77+
SAGE_VENV
78+
SAGE_SPKG_WHEELS
79+
80+
setenv = {[pkgenv]setenv}
81+
PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
82+
PIP_NO_INDEX=true
83+
84+
basepython = {env:SAGE_VENV}/bin/python3
5385

5486
[testenv:sagepython]
5587
basepython = {env:SAGE_VENV}/bin/python3
88+
package_env = .pkg-sagepython
5689

5790
[testenv:sagepython-sagewheels-nopypi]
5891
basepython = {env:SAGE_VENV}/bin/python3
92+
package_env = .pkg-sagepython-sagewheels-nopypi
5993

6094
[testenv:sagepython-sagewheels-nopypi-norequirements]
6195
basepython = {env:SAGE_VENV}/bin/python3
96+
package_env = .pkg-sagepython-sagewheels-nopypi
6297

6398
[testenv:sagepython-sagewheels]
64-
basepython = {env:SAGE_VENV}/bin/python3
99+
basepython = {env:SAGE_VENV}/bin/python
100+
package_env = .pkg-sagepython
65101

66102
[testenv:sagepython-norequirements]
67103
basepython = {env:SAGE_VENV}/bin/python3
104+
package_env = .pkg-sagepython

‎pkgs/sagemath-environment/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.0
1+
10.1.beta0

0 commit comments

Comments
 (0)