Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit e068bd9

Browse files
author
Matthias Koeppe
committed
Merge #29039
2 parents 6bd807b + 0026892 commit e068bd9

File tree

825 files changed

+9363
-12036
lines changed

Some content is hidden

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

825 files changed

+9363
-12036
lines changed

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

+1-1
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

+1-1
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

+6-2
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

+4-4
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

+1
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ src/*.egg-info/
190190
/src/bin/sage-src-env-config
191191

192192
# Virtual environments
193+
/venv
193194
src/.env
194195
src/.venv
195196
src/env/

‎.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: 9.5.beta3",
5-
"version": "9.5.beta3",
4+
"title": "sagemath/sage: 9.5.beta5",
5+
"version": "9.5.beta5",
66
"upload_type": "software",
7-
"publication_date": "2021-10-11",
7+
"publication_date": "2021-10-28",
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.beta5",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎COPYING.txt

-1
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

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ distclean: build-clean
120120
@echo "Deleting all remaining output from build system ..."
121121
rm -rf local
122122
rm -f src/bin/sage-env-config
123+
rm -f prefix venv
123124

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

‎Pipfile.m4

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ numpy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../numpy/package-version.txt)')"
2424
cysignals = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cysignals/package-version.txt)')"
2525
cypari2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cypari/package-version.txt)')"
2626
gmpy2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../gmpy2/package-version.txt)')"
27-
psutil = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../psutil/package-version.txt)')"
2827
pexpect = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../pexpect/package-version.txt)')"
2928
ipython = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../ipython/package-version.txt)')"
3029
sympy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../sympy/package-version.txt)')"

‎VERSION.txt

+1-1
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.beta5, Release Date: 2021-10-28

‎bootstrap

+7-2
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

‎build/bin/sage-dist-helpers

+12-5
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,17 @@ sdh_store_and_pip_install_wheel() {
306306
local sudo=""
307307
local root=""
308308
fi
309+
# Trac #32659: pip no longer reinstalls local wheels if the version is the same.
310+
# Because neither (1) applying patches nor (2) local changes (in the case
311+
# of sage-conf, sage-setup, etc.) bump the version number, we need to
312+
# override this behavior. The pip install option --force-reinstall does too
313+
# much -- it also reinstalls all dependencies, which we do not want.
314+
wheel_basename="${wheel##*/}"
315+
distname="${wheel_basename%%-*}"
316+
$sudo sage-pip-uninstall "$distname"
317+
if [ $? -ne 0 ]; then
318+
echo "(ignoring error)" >&2
319+
fi
309320
$sudo sage-pip-install $root $pip_options "$wheel" || \
310321
sdh_die "Error installing ${wheel##*/}"
311322
if [ -n "${SAGE_PKG_DIR}" ]; then
@@ -316,11 +327,7 @@ sdh_store_and_pip_install_wheel() {
316327
}
317328

318329
sdh_pip_uninstall() {
319-
# --disable-pip-version-check: Don't periodically check PyPI to determine whether a new version of pip is available
320-
# --no-input: Disable prompting for input.
321-
# --yes: Don't ask for confirmation of uninstall deletions
322-
# See sage-pip-install for a discussion of the other flags.
323-
python3 -m pip uninstall --isolated --disable-pip-version-check --yes --no-input "$@"
330+
sage-pip-uninstall "$@"
324331
if [ $? -ne 0 ]; then
325332
echo "Warning: pip exited with status $?" >&2
326333
fi

‎build/bin/sage-pip-uninstall

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
# This command ensures that any previous installations of the same package
3+
# are uninstalled.
4+
5+
# Note: "sage-pip-uninstall" is meant to be run after $(PYTHON) has
6+
# been installed (either as an spkg or as a venv over a system python3).
7+
# It is then guaranteed by sage-env that PATH is set in a way that "python3"
8+
# refers to the correct python3.
9+
PYTHON=python3
10+
11+
# The PIP variable is only used to determine the name of the lock file.
12+
PIP=pip3
13+
14+
# We should avoid running pip while uninstalling a package because that
15+
# is prone to race conditions. Therefore, we use a lockfile while
16+
# running pip. This is implemented in the Python script sage-flock
17+
LOCK="$SAGE_LOCAL/var/lock/$PIP.lock"
18+
19+
# --disable-pip-version-check: Don't periodically check PyPI to determine whether a new version of pip is available
20+
# --no-input: Disable prompting for input.
21+
# --yes: Don't ask for confirmation of uninstall deletions
22+
# See sage-pip-install for a discussion of the other flags.
23+
sage-flock -x $LOCK $PYTHON -m pip uninstall --isolated --disable-pip-version-check --yes --no-input "$@"

‎build/bin/sage-print-system-package-command

+3
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ case $system:$command in
149149
pip:install)
150150
[ -n "$system_packages" ] && print_shell_command "sage -pip install $system_packages"
151151
;;
152+
cpan:install)
153+
[ -n "$system_packages" ] && print_shell_command "cpan -i $system_packages"
154+
;;
152155
repology:install)
153156
if [ -n "$system_packages" ]; then
154157
links=""

‎build/bin/sage-spkg-info

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ if [ $have_repology = yes ]; then
5757
systems="$systems repology"
5858
fi
5959
for system in $systems; do
60+
system_package_file="$PKG_DISTROS"/$system.txt
6061
system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
6162
case $system in
6263
debian)

‎build/bin/write-dockerfile.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ ARG NUMPROC=8
219219
ENV MAKE="make -j\${NUMPROC}"
220220
ARG USE_MAKEFLAGS="-k V=0"
221221
ENV SAGE_CHECK=warn
222-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
222+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
223223
#:toolchain:
224224
$RUN make \${USE_MAKEFLAGS} base-toolchain $ENDRUN
225225
@@ -228,7 +228,7 @@ ARG NUMPROC=8
228228
ENV MAKE="make -j\${NUMPROC}"
229229
ARG USE_MAKEFLAGS="-k V=0"
230230
ENV SAGE_CHECK=warn
231-
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
231+
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
232232
#:make:
233233
ARG TARGETS_PRE="all-sage-local"
234234
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE} $ENDRUN
@@ -238,7 +238,7 @@ ARG NUMPROC=8
238238
ENV MAKE="make -j\${NUMPROC}"
239239
ARG USE_MAKEFLAGS="-k V=0"
240240
ENV SAGE_CHECK=warn
241-
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
241+
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
242242
ADD src src
243243
ARG TARGETS="build"
244244
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS} $ENDRUN
@@ -248,7 +248,7 @@ ARG NUMPROC=8
248248
ENV MAKE="make -j\${NUMPROC}"
249249
ARG USE_MAKEFLAGS="-k V=0"
250250
ENV SAGE_CHECK=warn
251-
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
251+
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
252252
ARG TARGETS_OPTIONAL="ptest"
253253
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)" $ENDRUN
254254

‎build/make/Makefile.in

+18-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SPKG_INST_RELDIR = var/lib/sage/installed
3232
# Aliases for mutually exclusive standard packages selected at configure time
3333
TOOLCHAIN = @SAGE_TOOLCHAIN@
3434
PYTHON = python3
35-
MP_LIBRARY = @SAGE_MP_LIBRARY@
35+
MP_LIBRARY = gmp
3636
BLAS = openblas
3737

3838
# pkgconfig files generated/installed at build time
@@ -287,8 +287,7 @@ python3-SAGE_VENV-no-deps: setuptools-clean
287287

288288
# Everything needed to start up Sage using "./sage". Of course, not
289289
# every part of Sage will work. It does not include Maxima for example.
290-
SAGERUNTIME = sagelib $(inst_ipython) $(inst_pexpect) \
291-
$(inst_psutil)
290+
SAGERUNTIME = sagelib $(inst_ipython) $(inst_pexpect)
292291

293292
all-sageruntime: toolchain-deps
294293
+$(MAKE_REC) $(SAGERUNTIME)
@@ -631,16 +630,29 @@ $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2): $(3)
631630
$(1): $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)
632631

633632
$(1)-$(4)-no-deps:
634-
$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
633+
@if [ -x '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' ]; then \
634+
$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
635635
. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
636636
. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
637637
. '$$(SAGE_ROOT)/src/bin/sage-env' && \
638638
. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
639639
. '$$(SAGE_ROOT)/build/bin/sage-build-env' && \
640640
SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
641641
SAGE_INST_LOCAL=$$($(4)) \
642-
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log'
643-
touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"
642+
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
643+
touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
644+
else \
645+
echo; \
646+
echo "Error: $(1) is a dummy script package that the Sage distribution uses"; \
647+
echo "to provide information about equivalent system packages."; \
648+
echo "It cannot be installed using the Sage distribution."; \
649+
echo "Please install it manually, for example using the system packages"; \
650+
echo "recommended at the end of a run of './configure'"; \
651+
echo "See below for package-specific information."; \
652+
echo; \
653+
$$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
654+
exit 1; \
655+
fi
644656

645657
$(1)-no-deps: $(1)-$(4)-no-deps
646658

‎build/pkgs/4ti2/spkg-configure.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SAGE_SPKG_CONFIGURE([4ti2], [
2-
SAGE_SPKG_DEPCHECK([gmp mpir glpk zlib], [
2+
SAGE_SPKG_DEPCHECK([gmp glpk zlib], [
33
dnl Debian installs these programs with an executable prefix "4ti2-",
44
dnl OpenSUSE uses the prefix "4ti2_".
55
dnl Singular checks for unprefixed and prefixed with "4ti2-".

‎build/pkgs/arb/SPKG.rst

-11
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,3 @@ Upstream Contact
2525
- https://arblib.org/
2626

2727
- http://github.com/fredrik-johansson/arb/
28-
29-
Dependencies
30-
------------
31-
32-
- FLINT
33-
- MPIR or GMP
34-
- MPFR
35-
36-
37-
Special Update/Build Instructions
38-
---------------------------------

‎build/pkgs/argcomplete/type

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
optional
1+
standard

‎build/pkgs/backcall/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core toml
1+
$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/cddlib/SPKG.rst

-5
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,3 @@ Upstream Contact
3131
----------------
3232

3333
https://github.com/cddlib/cddlib
34-
35-
Dependencies
36-
------------
37-
38-
- gmp (or its fork mpir)

‎build/pkgs/cddlib/spkg-configure.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SAGE_SPKG_CONFIGURE([cddlib], [
2-
SAGE_SPKG_DEPCHECK([gmp mpir], [
2+
SAGE_SPKG_DEPCHECK([gmp], [
33
dnl The sage library uses BOTH cddexec and cddexec_gmp.
44
dnl These two executables were introduced in cddlib-094j.
55
AC_CHECK_PROGS([CDDEXEC], [cddexec])

‎build/pkgs/cocoalib/SPKG.rst

-11
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,3 @@ Upstream Contact
1919
- Email: [email protected]
2020
- Website: http://cocoa.dima.unige.it/
2121
- Releases: http://cocoa.dima.unige.it/cocoalib/
22-
23-
Dependencies
24-
------------
25-
26-
- GMP/MPIR
27-
28-
29-
Special Update/Build Instructions
30-
---------------------------------
31-
32-
None.

‎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=9c45053634b6912dd4e4e68a483b5dbd483fc47d
3-
md5=11496f4636f7c19bb4cfbaf6e57af698
4-
cksum=2205302326
2+
sha1=ab6592f2216c48049bbbcfb3a42c3e157f44d917
3+
md5=fc3a50e0f47802e55969eade44648af4
4+
cksum=3704729867

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
32c0d4075fb515a073925ad1feefcc4fc349b47d
1+
c5a87834e7e2939b878a5134cd240e6c712bd573

‎build/pkgs/cvxopt/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig nose matplotlib
1+
$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig matplotlib $(and $(filter-out no,$(SAGE_CHECK_cvxopt)), pytest)
22

33
matplotlib is needed to test cvxopt (i.e., if SAGE_CHECK=yes). See #12742.
44

‎build/pkgs/cvxopt/spkg-check.in

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
cd src
22

3-
if ! command -v nosetests ; then
4-
echo >&2 'Testing cvxopt requires the package nose to be installed'
5-
exit 1
6-
fi
7-
8-
nosetests
3+
pytest

‎build/pkgs/e_antic/SPKG.rst

-7
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,3 @@ Upstream Contact
1919
----------------
2020

2121
- https://github.com/videlec/e-antic
22-
23-
Dependencies
24-
------------
25-
26-
- GMP/MPIR
27-
- FLINT
28-
- ARB

0 commit comments

Comments
 (0)