Skip to content

Commit 0e58569

Browse files
yyyyx4yyyyx4
committed
Merge tag '9.5.beta4' into public/make_WeierstrassIsomorphism_behave_like_EllipticCurveIsogeny
SageMath version 9.5.beta4, Release Date: 2021-10-19
2 parents 894b145 + 056b8d4 commit 0e58569

File tree

606 files changed

+6119
-5366
lines changed

Some content is hidden

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

606 files changed

+6119
-5366
lines changed

‎.github/workflows/ci-cygwin-minimal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
cygwin-stage-i-b:
8585
env:
8686
STAGE: i-b
87-
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
87+
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
8888
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
8989
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
9090

‎.github/workflows/ci-cygwin-standard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
cygwin-stage-i-b:
8585
env:
8686
STAGE: i-b
87-
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
87+
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
8888
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
8989
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
9090

‎.github/workflows/tox-experimental.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ jobs:
4848
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4949
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
5050
DOCKER_TARGETS: configured with-targets with-targets-optional
51-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
51+
# Test all non-dummy experimental packages, but do not test huge packages
52+
# and do not test packages that require external software
53+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
5254
steps:
5355
- uses: actions/checkout@v2
5456
with:
@@ -147,7 +149,9 @@ jobs:
147149
env:
148150
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
149151
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
150-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
152+
# Test all non-dummy experimental packages, but do not test huge packages
153+
# and do not test packages that require external software
154+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
151155
steps:
152156
- uses: actions/checkout@v2
153157
- name: Select Xcode version

‎.github/workflows/tox-optional.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ jobs:
4848
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4949
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
5050
DOCKER_TARGETS: configured with-targets with-targets-optional
51-
# Test all optional packages, but do not test huge packages,
51+
# Test all non-dummy optional packages, but do not test huge packages
5252
# and do not test packages that require external software
53-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
53+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
5454
steps:
5555
- uses: actions/checkout@v2
5656
with:
@@ -149,9 +149,9 @@ jobs:
149149
env:
150150
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
151151
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
152-
# Test all optional packages, but do not test huge packages
152+
# Test all non-dummy optional packages, but do not test huge packages
153153
# and do not test packages that require external software
154-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
154+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
155155
steps:
156156
- uses: actions/checkout@v2
157157
- name: Select Xcode version

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ src/*.egg-info/
182182
/src/bin/sage-src-env-config
183183

184184
# Virtual environments
185+
/venv
185186
src/.env
186187
src/.venv
187188
src/env/

‎.zenodo.json

Lines changed: 4 additions & 4 deletions
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: 9.5.beta3",
5-
"version": "9.5.beta3",
4+
"title": "sagemath/sage: 9.5.beta4",
5+
"version": "9.5.beta4",
66
"upload_type": "software",
7-
"publication_date": "2021-10-11",
7+
"publication_date": "2021-10-19",
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/9.5.beta3",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎COPYING.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ mistune Modified BSD
8585
mpc LGPLv3+
8686
mpfi COPYING is GPLv2, source files state LGPLv2.1+
8787
mpfr LGPLv3+
88-
mpir LGPLv3+
8988
mpmath Modified BSD
9089
networkx Modified BSD
9190
ntl GPLv2+

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ distclean: build-clean
109109
@echo "Deleting all remaining output from build system ..."
110110
rm -rf local
111111
rm -f src/bin/sage-env-config
112+
rm -f prefix venv
112113

113114
# Delete all auto-generated files which are distributed as part of the
114115
# source tarball

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.5.beta3, Release Date: 2021-10-11
1+
SageMath version 9.5.beta4, Release Date: 2021-10-19

‎bootstrap

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,13 @@ AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [y
9797
case "$pkgname" in
9898
_*) ;;
9999
*) spkg_configures="$spkg_configures
100-
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])
101-
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])" ;;
100+
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])"
101+
if [ -f build/pkgs/$pkgname/spkg-install -o -f build/pkgs/$pkgname/spkg-install.in ]; then
102+
# Trac #31163: Not just an optional dummy package
103+
spkg_configures="$spkg_configures
104+
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])"
105+
fi
106+
;;
102107
esac
103108
fi
104109
done

0 commit comments

Comments
 (0)