Merge tag '9.5.beta5' into public/make_NumberFieldFractionalIdeal_inh…

…erit_from_Ideal_fractional

SageMath version 9.5.beta5, Release Date: 2021-10-28

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

@@ -84,7 +84,7 @@ jobs:
   cygwin-stage-i-b:
     env:
       STAGE: i-b
-      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
+      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
 

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

@@ -84,7 +84,7 @@ jobs:
   cygwin-stage-i-b:
     env:
       STAGE: i-b
-      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
+      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
 

.github/workflows/tox-experimental.yml

@@ -48,7 +48,9 @@ jobs:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       DOCKER_TARGETS: configured with-targets with-targets-optional
-      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 }}]' ) )"
+      # Test all non-dummy experimental packages, but do not test huge packages
+      # and do not test packages that require external software
+      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 }}]' ) )"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -147,7 +149,9 @@ jobs:
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
-      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 }}]' ) )"
+      # Test all non-dummy experimental packages, but do not test huge packages
+      # and do not test packages that require external software
+      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 }}]' ) )"
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode version

.github/workflows/tox-optional.yml

@@ -48,9 +48,9 @@ jobs:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       DOCKER_TARGETS: configured with-targets with-targets-optional
-      # Test all optional packages, but do not test huge packages,
+      # Test all non-dummy optional packages, but do not test huge packages
       # and do not test packages that require external software
-      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 }}]' ) )"
+      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 }}]' ) )"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -149,9 +149,9 @@ jobs:
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
-      # Test all optional packages, but do not test huge packages
+      # Test all non-dummy optional packages, but do not test huge packages
       # and do not test packages that require external software
-      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 }}]' ) )"
+      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 }}]' ) )"
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode version

.gitignore

@@ -182,6 +182,7 @@ src/*.egg-info/
 /src/bin/sage-src-env-config
 
 # Virtual environments
+/venv
 src/.env
 src/.venv
 src/env/

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.5.beta3", 
-    "version": "9.5.beta3", 
+    "title": "sagemath/sage: 9.5.beta5", 
+    "version": "9.5.beta5", 
     "upload_type": "software", 
-    "publication_date": "2021-10-11", 
+    "publication_date": "2021-10-28", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta3", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta5", 
             "relation": "isSupplementTo"
         }, 
         {

COPYING.txt

@@ -85,7 +85,6 @@ mistune                     Modified BSD
 mpc                         LGPLv3+
 mpfi                        COPYING is GPLv2, source files state LGPLv2.1+
 mpfr                        LGPLv3+
-mpir                        LGPLv3+
 mpmath                      Modified BSD
 networkx                    Modified BSD
 ntl                         GPLv2+

Makefile

@@ -109,6 +109,7 @@ distclean: build-clean
 	@echo "Deleting all remaining output from build system ..."
 	rm -rf local
 	rm -f src/bin/sage-env-config
+	rm -f prefix venv
 
 # Delete all auto-generated files which are distributed as part of the
 # source tarball

Pipfile.m4

@@ -24,7 +24,6 @@ numpy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../numpy/package-version.txt)')"
 cysignals = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cysignals/package-version.txt)')"
 cypari2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../cypari/package-version.txt)')"
 gmpy2 = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../gmpy2/package-version.txt)')"
-psutil = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../psutil/package-version.txt)')"
 pexpect = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../pexpect/package-version.txt)')"
 ipython = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../ipython/package-version.txt)')"
 sympy = "==esyscmd(`printf $(sed "s/[.]p.*//;" ../sympy/package-version.txt)')"

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.5.beta3, Release Date: 2021-10-11
+SageMath version 9.5.beta5, Release Date: 2021-10-28

bootstrap

@@ -97,8 +97,13 @@ AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [y
                     case "$pkgname" in
                         _*) ;;
                         *)  spkg_configures="$spkg_configures
-AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])
-SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])" ;;
+AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])"
+                            if [ -f build/pkgs/$pkgname/spkg-install -o -f build/pkgs/$pkgname/spkg-install.in ]; then
+                                # Trac #31163: Not just an optional dummy package
+                                spkg_configures="$spkg_configures
+SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])"
+                            fi
+                            ;;
                     esac
                 fi
     done

build/bin/sage-dist-helpers

@@ -306,6 +306,17 @@ sdh_store_and_pip_install_wheel() {
         local sudo=""
         local root=""
     fi
+    # Trac #32659: pip no longer reinstalls local wheels if the version is the same.
+    # Because neither (1) applying patches nor (2) local changes (in the case
+    # of sage-conf, sage-setup, etc.) bump the version number, we need to
+    # override this behavior.  The pip install option --force-reinstall does too
+    # much -- it also reinstalls all dependencies, which we do not want.
+    wheel_basename="${wheel##*/}"
+    distname="${wheel_basename%%-*}"
+    $sudo sage-pip-uninstall "$distname"
+    if [ $? -ne 0 ]; then
+        echo "(ignoring error)" >&2
+    fi
     $sudo sage-pip-install $root $pip_options "$wheel" || \
         sdh_die "Error installing ${wheel##*/}"
     if [ -n "${SAGE_PKG_DIR}" ]; then
@@ -316,11 +327,7 @@ sdh_store_and_pip_install_wheel() {
 }
 
 sdh_pip_uninstall() {
-    # --disable-pip-version-check: Don't periodically check PyPI to determine whether a new version of pip is available
-    # --no-input: Disable prompting for input.
-    # --yes: Don't ask for confirmation of uninstall deletions
-    # See sage-pip-install for a discussion of the other flags.
-    python3 -m pip uninstall --isolated --disable-pip-version-check --yes --no-input "$@"
+    sage-pip-uninstall "$@"
     if [ $? -ne 0 ]; then
         echo "Warning: pip exited with status $?" >&2
     fi

build/bin/sage-pip-uninstall

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

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

@@ -149,6 +149,9 @@ case $system:$command in
     pip:install)
         [ -n "$system_packages" ] && print_shell_command "sage -pip install $system_packages"
         ;;
+    cpan:install)
+        [ -n "$system_packages" ] && print_shell_command "cpan -i $system_packages"
+        ;;
     repology:install)
         if [ -n "$system_packages" ]; then
             links=""

build/bin/sage-spkg-info

@@ -57,6 +57,7 @@ if [ $have_repology = yes ]; then
     systems="$systems repology"
 fi
 for system in $systems; do
+        system_package_file="$PKG_DISTROS"/$system.txt
         system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
         case $system in
             debian)

build/bin/write-dockerfile.sh

@@ -219,7 +219,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:toolchain:
 $RUN make \${USE_MAKEFLAGS} base-toolchain $ENDRUN
 
@@ -228,7 +228,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:make:
 ARG TARGETS_PRE="all-sage-local"
 $RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE} $ENDRUN
@@ -238,7 +238,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 ADD src src
 ARG TARGETS="build"
 $RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS} $ENDRUN
@@ -248,7 +248,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 ARG TARGETS_OPTIONAL="ptest"
 $RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)" $ENDRUN
 

build/make/Makefile.in

@@ -32,7 +32,7 @@ SPKG_INST_RELDIR = var/lib/sage/installed
 # Aliases for mutually exclusive standard packages selected at configure time
 TOOLCHAIN = @SAGE_TOOLCHAIN@
 PYTHON = python3
-MP_LIBRARY = @SAGE_MP_LIBRARY@
+MP_LIBRARY = gmp
 BLAS = openblas
 
 # pkgconfig files generated/installed at build time
@@ -288,8 +288,7 @@ python3-SAGE_VENV-no-deps: setuptools-clean
 
 # Everything needed to start up Sage using "./sage".  Of course, not
 # every part of Sage will work.  It does not include Maxima for example.
-SAGERUNTIME = sagelib $(inst_ipython) $(inst_pexpect) \
-		$(inst_psutil)
+SAGERUNTIME = sagelib $(inst_ipython) $(inst_pexpect)
 
 all-sageruntime: toolchain-deps
 	+$(MAKE_REC) $(SAGERUNTIME)
@@ -535,8 +534,10 @@ $(1)-$(4)-no-deps:
 $(1)-no-deps: $(1)-$(4)-no-deps
 
 $(1)-$(4)-clean:
-	sage-spkg-uninstall $(if $(filter $(1),$(TOOLCHAIN_DEPS)),--keep-files) \
-		$(1) '$$($(4))'
+	if [ -d '$$($(4))' ]; then \
+	    sage-spkg-uninstall $(if $(filter $(1),$(TOOLCHAIN_DEPS)),--keep-files) \
+		$(1) '$$($(4))'; \
+	fi
 
 $(1)-clean: $(1)-$(4)-clean
 
@@ -630,16 +631,29 @@ $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2): $(3)
 $(1): $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)
 
 $(1)-$(4)-no-deps:
-	$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
+	@if [ -x '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' ]; then \
+	    $(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env' && \
 		. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
 		. '$$(SAGE_ROOT)/build/bin/sage-build-env' && \
 		SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
 		SAGE_INST_LOCAL=$$($(4)) \
-		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log'
-	touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"
+		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
+	    touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
+	else \
+	    echo; \
+	    echo "Error: $(1) is a dummy script package that the Sage distribution uses"; \
+	    echo "to provide information about equivalent system packages."; \
+	    echo "It cannot be installed using the Sage distribution."; \
+	    echo "Please install it manually, for example using the system packages"; \
+	    echo "recommended at the end of a run of './configure'"; \
+	    echo "See below for package-specific information."; \
+	    echo; \
+	    $$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
+	    exit 1; \
+	fi
 
 $(1)-no-deps: $(1)-$(4)-no-deps
 

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

@@ -1,5 +1,5 @@
 SAGE_SPKG_CONFIGURE([4ti2], [
-    SAGE_SPKG_DEPCHECK([gmp mpir glpk zlib], [
+    SAGE_SPKG_DEPCHECK([gmp glpk zlib], [
         dnl Debian installs these programs with an executable prefix "4ti2-",
         dnl OpenSUSE uses the prefix "4ti2_".
         dnl Singular checks for unprefixed and prefixed with "4ti2-".

build/pkgs/arb/SPKG.rst

@@ -25,14 +25,3 @@ Upstream Contact
  - https://arblib.org/
 
  - http://github.com/fredrik-johansson/arb/
-
-Dependencies
-------------
-
--  FLINT
--  MPIR or GMP
--  MPFR
-
-
-Special Update/Build Instructions
----------------------------------

build/pkgs/argcomplete/type

@@ -1 +1 @@
-optional
+standard

build/pkgs/backcall/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core toml
+$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/cddlib/SPKG.rst

@@ -31,8 +31,3 @@ Upstream Contact
 ----------------
 
 https://github.com/cddlib/cddlib
-
-Dependencies
-------------
-
--  gmp (or its fork mpir)

build/pkgs/cddlib/spkg-configure.m4

@@ -1,5 +1,5 @@
 SAGE_SPKG_CONFIGURE([cddlib], [
-  SAGE_SPKG_DEPCHECK([gmp mpir], [
+  SAGE_SPKG_DEPCHECK([gmp], [
     dnl The sage library uses BOTH cddexec and cddexec_gmp.
     dnl These two executables were introduced in cddlib-094j.
     AC_CHECK_PROGS([CDDEXEC], [cddexec])

build/pkgs/cocoalib/SPKG.rst

@@ -19,14 +19,3 @@ Upstream Contact
 -  Email: [email protected]
 -  Website: http://cocoa.dima.unige.it/
 -  Releases: http://cocoa.dima.unige.it/cocoalib/
-
-Dependencies
-------------
-
--  GMP/MPIR
-
-
-Special Update/Build Instructions
----------------------------------
-
-None.

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=9c45053634b6912dd4e4e68a483b5dbd483fc47d
-md5=11496f4636f7c19bb4cfbaf6e57af698
-cksum=2205302326
+sha1=ab6592f2216c48049bbbcfb3a42c3e157f44d917
+md5=fc3a50e0f47802e55969eade44648af4
+cksum=3704729867

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-32c0d4075fb515a073925ad1feefcc4fc349b47d
+c5a87834e7e2939b878a5134cd240e6c712bd573

build/pkgs/cvxopt/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig nose matplotlib
+$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig matplotlib $(and $(filter-out no,$(SAGE_CHECK_cvxopt)), pytest)
 
 matplotlib is needed to test cvxopt (i.e., if SAGE_CHECK=yes). See #12742.