diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 5f049741eab..6f598521a37 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -63,6 +63,56 @@ jobs: ["standard"] docker_push_repository: ghcr.io/${{ github.repository }}/ + standard-sitepackages: + if: ${{ success() || failure() }} + needs: [standard-pre] + uses: ./.github/workflows/docker.yml + with: + # Build incrementally from previous stage (pre) + incremental: true + free_disk_space: true + from_docker_repository: ghcr.io/${{ github.repository }}/ + from_docker_target: "with-targets-pre" + docker_targets: "with-targets with-targets-optional" + # FIXME: duplicated from env.TARGETS + targets: build doc-html + targets_optional: ptest + tox_packages_factors: >- + ["standard-sitepackages"] + # Only test systems with a usable system python (>= 3.9) + tox_system_factors: >- + ["ubuntu-jammy", + "ubuntu-kinetic", + "ubuntu-lunar", + "ubuntu-mantic", + "debian-bullseye", + "debian-bookworm", + "debian-trixie", + "debian-sid", + "linuxmint-21", + "linuxmint-21.1", + "linuxmint-21.2", + "fedora-33", + "fedora-34", + "fedora-35", + "fedora-36", + "fedora-37", + "fedora-38", + "fedora-39", + "centos-stream-8-python3.9", + "centos-stream-9-python3.9", + "almalinux-8-python3.9", + "gentoo-python3.10", + "gentoo-python3.11", + "archlinux-latest", + "opensuse-15.4-gcc_11-python3.10", + "opensuse-15.5-gcc_11-python3.11", + "opensuse-tumbleweed-python3.10", + "opensuse-tumbleweed", + "debian-bullseye-i386"] + docker_push_repository: ghcr.io/${{ github.repository }}/ + max_parallel: 10 + minimal-pre: if: ${{ success() || failure() }} # It does not really "need" it. diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 403093635ce..e6104c4a7cb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -57,6 +57,7 @@ on: "opensuse-15.4-gcc_11-python3.10", "opensuse-15.5-gcc_11-python3.11", "opensuse-tumbleweed-python3.10", + "opensuse-tumbleweed", "conda-forge", "ubuntu-bionic-gcc_8-i386", "debian-bullseye-i386", diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in index b00fd2a3f99..7d6cd113bf9 100644 --- a/build/bin/sage-build-env-config.in +++ b/build/bin/sage-build-env-config.in @@ -53,9 +53,13 @@ export SAGE_PARI_CFG="@SAGE_PARI_CFG@" export SAGE_GLPK_PREFIX="@SAGE_GLPK_PREFIX@" export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@" +export SAGE_PIP_INSTALL_FLAGS="@SAGE_PIP_INSTALL_FLAGS@" export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@" export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@" export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@" export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@" + +export ENABLE_SYSTEM_SITE_PACKAGES="@ENABLE_SYSTEM_SITE_PACKAGES@" +export PYTHON_MINOR="@PYTHON_MINOR@" diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers index 4eac9626ffa..67a2201d31f 100644 --- a/build/bin/sage-dist-helpers +++ b/build/bin/sage-dist-helpers @@ -325,7 +325,11 @@ sdh_store_wheel() { } sdh_store_and_pip_install_wheel() { - local pip_options="" + # The $SAGE_PIP_INSTALL_FLAGS variable is set by sage-build-env-config. + # We skip sanity checking its contents since you should either let sage + # decide what it contains, or really know what you are doing. + local pip_options="${SAGE_PIP_INSTALL_FLAGS}" + while [ $# -gt 0 ]; do case $1 in -*) pip_options="$pip_options $1" diff --git a/build/bin/sage-get-system-packages b/build/bin/sage-get-system-packages index c51c36ceab9..c8b9314c3fe 100755 --- a/build/bin/sage-get-system-packages +++ b/build/bin/sage-get-system-packages @@ -1,4 +1,5 @@ #!/bin/sh + SYSTEM=$1 if [ -z "$SYSTEM" ]; then echo >&2 "usage: $0 {auto|debian|arch|conda|pip|...} SPKGS..." @@ -10,6 +11,7 @@ SPKGS="$*" if [ -z "$SAGE_ROOT" ]; then SAGE_ROOT=`pwd` fi + case "$SYSTEM" in install-requires) # Collect install-requires.txt (falling back to requirements.txt) and output it in the format @@ -44,6 +46,18 @@ case "$SYSTEM" in ;; esac for PKG_BASE in $SPKGS; do + + # Skip this package if it uses the SAGE_PYTHON_PACKAGE_CHECK + # macro and if --enable-system-site-packages was NOT passed + # to ./configure (or if ./configure has not yet been run). + SPKG_CONFIGURE="${SAGE_ROOT}/build/pkgs/${PKG_BASE}/spkg-configure.m4" + if [ -z "${ENABLE_SYSTEM_SITE_PACKAGES}" ]; then + if grep -q SAGE_PYTHON_PACKAGE_CHECK "${SPKG_CONFIGURE}" 2>/dev/null; + then + continue; + fi + fi + for NAME in $SYSTEM_PACKAGES_FILE_NAMES; do SYSTEM_PACKAGES_FILE="$SAGE_ROOT"/build/pkgs/$PKG_BASE/$NAME if [ -f $SYSTEM_PACKAGES_FILE ]; then diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info index d02b3ac347f..e43e516dc5b 100755 --- a/build/bin/sage-spkg-info +++ b/build/bin/sage-spkg-info @@ -110,17 +110,19 @@ if [ -z "$system" ]; then echo "(none known)" else echo - if [ -f "$PKG_SCRIPTS"/spkg-configure.m4 ]; then - echo "If the system package is installed, ./configure will check whether it can be used." - else - echo "However, these system packages will not be used for building Sage" - if [ -f "$PKG_SCRIPTS"/install-requires.txt ]; then - echo "because using Python site-packages is not supported by the Sage distribution;" - echo "see https://github.com/sagemath/sage/issues/29023" + SPKG_CONFIGURE="${PKG_SCRIPTS}/spkg-configure.m4" + if [ -f "${SPKG_CONFIGURE}" ]; then + if grep -q SAGE_PYTHON_PACKAGE_CHECK "${SPKG_CONFIGURE}"; then + echo "If the system package is installed and if the (experimental) option" + echo "--enable-system-site-packages is passed to ./configure, then ./configure" + echo "will check if the system package can be used." else - echo "because spkg-configure.m4 has not been written for this package;" - echo "see https://github.com/sagemath/sage/issues/27330" + echo "If the system package is installed, ./configure will check if it can be used." fi + else + echo "However, these system packages will not be used for building Sage" + echo "because spkg-configure.m4 has not been written for this package;" + echo "see https://github.com/sagemath/sage/issues/27330" fi fi echo diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh index 14cbaf786eb..6980f6b6e4b 100755 --- a/build/bin/write-dockerfile.sh +++ b/build/bin/write-dockerfile.sh @@ -5,7 +5,7 @@ set -e SYSTEM="${1:-debian}" shopt -s extglob -SAGE_PACKAGE_LIST_ARGS="${2:- --has-file=spkg-configure.m4 :standard:}" +SAGE_PACKAGE_LIST_ARGS="${2:-:standard:}" WITH_SYSTEM_SPKG="${3:-yes}" IGNORE_MISSING_SYSTEM_PACKAGES="${4:-no}" EXTRA_SAGE_PACKAGES="${5:-_bootstrap}" @@ -15,17 +15,13 @@ SAGE_ROOT=. export PATH="$SAGE_ROOT"/build/bin:$PATH SYSTEM_PACKAGES=$EXTRA_SYSTEM_PACKAGES CONFIGURE_ARGS="--enable-option-checking " -for PKG_BASE in $(sage-package list --has-file=distros/$SYSTEM.txt $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do - PKG_SCRIPTS="$SAGE_ROOT"/build/pkgs/$PKG_BASE - if [ -d $PKG_SCRIPTS ]; then - SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/$SYSTEM.txt - PKG_SYSTEM_PACKAGES=$(echo $(${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE)) - if [ -n "PKG_SYSTEM_PACKAGES" ]; then - SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES" - if [ -f $PKG_SCRIPTS/spkg-configure.m4 ]; then - CONFIGURE_ARGS+="--with-system-$PKG_BASE=${WITH_SYSTEM_SPKG} " - fi - fi +for SPKG in $(sage-package list --has-file=spkg-configure.m4 $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do + SYSTEM_PACKAGE=$(sage-get-system-packages $SYSTEM $SPKG | sed 's/${PYTHON_MINOR}/'${PYTHON_MINOR}'/g') + if [ -n "${SYSTEM_PACKAGE}" ]; then + # SYSTEM_PACKAGE can be empty if, for example, the environment + # variable ENABLE_SYSTEM_SITE_PACKAGES is empty. + SYSTEM_PACKAGES+=" ${SYSTEM_PACKAGE}" + CONFIGURE_ARGS+="--with-system-${SPKG}=${WITH_SYSTEM_SPKG} " fi done echo "# Automatically generated by SAGE_ROOT/build/bin/write-dockerfile.sh" diff --git a/build/make/Makefile.in b/build/make/Makefile.in index 2d1a7e6c7b7..cc004d08c3c 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -227,11 +227,13 @@ SAGE_I_TARGETS = sagelib doc python3_venv _clean-broken-gcc PYTHON_FOR_VENV = @PYTHON_FOR_VENV@ +PYTHON_MINOR = @PYTHON_MINOR@ +SAGE_VENV_FLAGS = @SAGE_VENV_FLAGS@ ifneq ($(PYTHON_FOR_VENV),) # Special rule for making the Python virtualenv from the system Python (Python # 3 only). $(PYTHON) is set in Makefile to python3_venv. -# Thus $(inst_python3_venv) will be the dependency of every Python package. +# Thus $(inst_python3_venv) will an (order-only) dependency of every Python package. # # TODO: If we reconfigure to build our own Python after having used the system # Python, files installed to create the virtualenv should be *removed*. That @@ -239,10 +241,15 @@ ifneq ($(PYTHON_FOR_VENV),) ifeq ($(PYTHON),python3) PYTHON = python3_venv endif -inst_python3_venv = $(SAGE_VENV)/pyvenv.cfg +inst_python3_venv = $(SAGE_VENV)/$(SPKG_INST_RELDIR)/python3_venv-3.$(PYTHON_MINOR)-$(subst /,-,$(PYTHON_FOR_VENV))$(findstring --system-site-packages,$(SAGE_VENV_FLAGS)) -$(inst_python3_venv): - $(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv "$(SAGE_VENV)" +$(SAGE_VENV)/$(SPKG_INST_RELDIR): + mkdir -p "$@" + +$(inst_python3_venv): | $(SAGE_VENV)/$(SPKG_INST_RELDIR) + $(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv $(SAGE_VENV_FLAGS) "$(SAGE_VENV)" + rm -f "$(SAGE_VENV)/$(SPKG_INST_RELDIR)"/python3_venv-* + touch "$@" endif # Build everything and start Sage. diff --git a/build/pkgs/admcycles/dependencies b/build/pkgs/admcycles/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/admcycles/dependencies +++ b/build/pkgs/admcycles/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/alabaster/dependencies b/build/pkgs/alabaster/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/alabaster/dependencies +++ b/build/pkgs/alabaster/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/alabaster/distros/gentoo.txt b/build/pkgs/alabaster/distros/gentoo.txt new file mode 100644 index 00000000000..cffece61b27 --- /dev/null +++ b/build/pkgs/alabaster/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/alabaster diff --git a/build/pkgs/alabaster/distros/opensuse.txt b/build/pkgs/alabaster/distros/opensuse.txt index dcc39f9e849..debe990ce19 100644 --- a/build/pkgs/alabaster/distros/opensuse.txt +++ b/build/pkgs/alabaster/distros/opensuse.txt @@ -1 +1 @@ -python3-alabaster +python3${PYTHON_MINOR}-alabaster diff --git a/build/pkgs/alabaster/spkg-configure.m4 b/build/pkgs/alabaster/spkg-configure.m4 new file mode 100644 index 00000000000..4eca6e05a5f --- /dev/null +++ b/build/pkgs/alabaster/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([alabaster], [SAGE_PYTHON_PACKAGE_CHECK([alabaster])]) diff --git a/build/pkgs/appdirs/dependencies b/build/pkgs/appdirs/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/appdirs/dependencies +++ b/build/pkgs/appdirs/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/appnope/dependencies b/build/pkgs/appnope/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/appnope/dependencies +++ b/build/pkgs/appnope/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/argon2_cffi/dependencies b/build/pkgs/argon2_cffi/dependencies index d1b259926f8..920046ab33d 100644 --- a/build/pkgs/argon2_cffi/dependencies +++ b/build/pkgs/argon2_cffi/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) argon2_cffi_bindings | $(PYTHON_TOOLCHAIN) flit_core + argon2_cffi_bindings | $(PYTHON_TOOLCHAIN) flit_core $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/argon2_cffi/distros/gentoo.txt b/build/pkgs/argon2_cffi/distros/gentoo.txt new file mode 100644 index 00000000000..2f12ca869e4 --- /dev/null +++ b/build/pkgs/argon2_cffi/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/argon2-cffi diff --git a/build/pkgs/argon2_cffi/spkg-configure.m4 b/build/pkgs/argon2_cffi/spkg-configure.m4 new file mode 100644 index 00000000000..03ebc634492 --- /dev/null +++ b/build/pkgs/argon2_cffi/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([argon2_cffi], [SAGE_PYTHON_PACKAGE_CHECK([argon2_cffi])]) diff --git a/build/pkgs/argon2_cffi_bindings/dependencies b/build/pkgs/argon2_cffi_bindings/dependencies index 0d815c35f4b..4b9d24ccf44 100644 --- a/build/pkgs/argon2_cffi_bindings/dependencies +++ b/build/pkgs/argon2_cffi_bindings/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) cffi setuptools_scm + | $(PYTHON_TOOLCHAIN) cffi setuptools_scm $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/asttokens/dependencies b/build/pkgs/asttokens/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/asttokens/dependencies +++ b/build/pkgs/asttokens/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/attrs/dependencies b/build/pkgs/attrs/dependencies index 4361e46ddaf..9be6b4aab7c 100644 --- a/build/pkgs/attrs/dependencies +++ b/build/pkgs/attrs/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) vcversioner | $(PYTHON_TOOLCHAIN) + vcversioner | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/attrs/distros/gentoo.txt b/build/pkgs/attrs/distros/gentoo.txt new file mode 100644 index 00000000000..3b906facd3a --- /dev/null +++ b/build/pkgs/attrs/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/attrs diff --git a/build/pkgs/attrs/spkg-configure.m4 b/build/pkgs/attrs/spkg-configure.m4 new file mode 100644 index 00000000000..ba6a9b71efa --- /dev/null +++ b/build/pkgs/attrs/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([attrs], [SAGE_PYTHON_PACKAGE_CHECK([attrs])]) diff --git a/build/pkgs/auditwheel_or_delocate/dependencies b/build/pkgs/auditwheel_or_delocate/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/auditwheel_or_delocate/dependencies +++ b/build/pkgs/auditwheel_or_delocate/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/awali/dependencies b/build/pkgs/awali/dependencies index b125e2ded92..09b60167a34 100644 --- a/build/pkgs/awali/dependencies +++ b/build/pkgs/awali/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cmake cython nbconvert ncurses + cmake cython nbconvert ncurses | $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/babel/dependencies b/build/pkgs/babel/dependencies index 41462907c20..802e470da86 100644 --- a/build/pkgs/babel/dependencies +++ b/build/pkgs/babel/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) pytz + | $(PYTHON_TOOLCHAIN) pytz $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/babel/distros/arch.txt b/build/pkgs/babel/distros/arch.txt new file mode 100644 index 00000000000..f2d828ccc5c --- /dev/null +++ b/build/pkgs/babel/distros/arch.txt @@ -0,0 +1 @@ +python-babel diff --git a/build/pkgs/babel/distros/debian.txt b/build/pkgs/babel/distros/debian.txt new file mode 100644 index 00000000000..e623eb68a31 --- /dev/null +++ b/build/pkgs/babel/distros/debian.txt @@ -0,0 +1 @@ +python3-babel diff --git a/build/pkgs/babel/distros/fedora.txt b/build/pkgs/babel/distros/fedora.txt new file mode 100644 index 00000000000..98f65931c4c --- /dev/null +++ b/build/pkgs/babel/distros/fedora.txt @@ -0,0 +1 @@ +babel diff --git a/build/pkgs/babel/distros/gentoo.txt b/build/pkgs/babel/distros/gentoo.txt new file mode 100644 index 00000000000..2d2c34fb697 --- /dev/null +++ b/build/pkgs/babel/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/Babel diff --git a/build/pkgs/babel/distros/opensuse.txt b/build/pkgs/babel/distros/opensuse.txt index 70bb05b1327..6372e2e77da 100644 --- a/build/pkgs/babel/distros/opensuse.txt +++ b/build/pkgs/babel/distros/opensuse.txt @@ -1 +1 @@ -python3-Babel +python3${PYTHON_MINOR}-Babel diff --git a/build/pkgs/babel/install-requires.txt b/build/pkgs/babel/install-requires.txt index 1d0d6191bb9..b4db5e907f3 100644 --- a/build/pkgs/babel/install-requires.txt +++ b/build/pkgs/babel/install-requires.txt @@ -1 +1 @@ -babel >=2.6.0 +babel >=2.11.0 diff --git a/build/pkgs/babel/spkg-configure.m4 b/build/pkgs/babel/spkg-configure.m4 new file mode 100644 index 00000000000..d7b9a71c811 --- /dev/null +++ b/build/pkgs/babel/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([babel], [SAGE_PYTHON_PACKAGE_CHECK([babel])]) diff --git a/build/pkgs/backcall/dependencies b/build/pkgs/backcall/dependencies index 902a5feed13..4fedbe70cd1 100644 --- a/build/pkgs/backcall/dependencies +++ b/build/pkgs/backcall/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli + | $(PYTHON_TOOLCHAIN) flit_core tomli $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/backcall/distros/gentoo.txt b/build/pkgs/backcall/distros/gentoo.txt new file mode 100644 index 00000000000..266a222c558 --- /dev/null +++ b/build/pkgs/backcall/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/backcall diff --git a/build/pkgs/backcall/spkg-configure.m4 b/build/pkgs/backcall/spkg-configure.m4 new file mode 100644 index 00000000000..d6b11c49884 --- /dev/null +++ b/build/pkgs/backcall/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([backcall], [SAGE_PYTHON_PACKAGE_CHECK([backcall])]) diff --git a/build/pkgs/beautifulsoup4/dependencies b/build/pkgs/beautifulsoup4/dependencies index 01af7f65566..c9982dd1882 100644 --- a/build/pkgs/beautifulsoup4/dependencies +++ b/build/pkgs/beautifulsoup4/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) soupsieve | $(PYTHON_TOOLCHAIN) + soupsieve | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/beniget/dependencies b/build/pkgs/beniget/dependencies index d792a85db72..96da9efd5ac 100644 --- a/build/pkgs/beniget/dependencies +++ b/build/pkgs/beniget/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) gast | $(PYTHON_TOOLCHAIN) + gast | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/beniget/distros/gentoo.txt b/build/pkgs/beniget/distros/gentoo.txt new file mode 100644 index 00000000000..1a5972cd23f --- /dev/null +++ b/build/pkgs/beniget/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/beniget diff --git a/build/pkgs/beniget/spkg-configure.m4 b/build/pkgs/beniget/spkg-configure.m4 new file mode 100644 index 00000000000..8ae6101333e --- /dev/null +++ b/build/pkgs/beniget/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([beniget], [SAGE_PYTHON_PACKAGE_CHECK([beniget])]) diff --git a/build/pkgs/bleach/dependencies b/build/pkgs/bleach/dependencies index 4a74f9bfd68..c7ac2e8b3e7 100644 --- a/build/pkgs/bleach/dependencies +++ b/build/pkgs/bleach/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) packaging six webencodings | $(PYTHON_TOOLCHAIN) + packaging six webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/bleach/distros/arch.txt b/build/pkgs/bleach/distros/arch.txt new file mode 100644 index 00000000000..c5422ccff0c --- /dev/null +++ b/build/pkgs/bleach/distros/arch.txt @@ -0,0 +1 @@ +python-bleach diff --git a/build/pkgs/bleach/distros/debian.txt b/build/pkgs/bleach/distros/debian.txt new file mode 100644 index 00000000000..6d37c4c79f0 --- /dev/null +++ b/build/pkgs/bleach/distros/debian.txt @@ -0,0 +1 @@ +python3-bleach diff --git a/build/pkgs/bleach/distros/fedora.txt b/build/pkgs/bleach/distros/fedora.txt new file mode 100644 index 00000000000..c5422ccff0c --- /dev/null +++ b/build/pkgs/bleach/distros/fedora.txt @@ -0,0 +1 @@ +python-bleach diff --git a/build/pkgs/bleach/distros/gentoo.txt b/build/pkgs/bleach/distros/gentoo.txt new file mode 100644 index 00000000000..b4f9744eee9 --- /dev/null +++ b/build/pkgs/bleach/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/bleach diff --git a/build/pkgs/bleach/distros/opensuse.txt b/build/pkgs/bleach/distros/opensuse.txt new file mode 100644 index 00000000000..0e329f6dd62 --- /dev/null +++ b/build/pkgs/bleach/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-bleach diff --git a/build/pkgs/bleach/spkg-configure.m4 b/build/pkgs/bleach/spkg-configure.m4 new file mode 100644 index 00000000000..3c9bb26bb05 --- /dev/null +++ b/build/pkgs/bleach/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([bleach], [SAGE_PYTHON_PACKAGE_CHECK([bleach])]) diff --git a/build/pkgs/certifi/dependencies b/build/pkgs/certifi/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/certifi/dependencies +++ b/build/pkgs/certifi/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/certifi/distros/arch.txt b/build/pkgs/certifi/distros/arch.txt new file mode 100644 index 00000000000..be421c8b4b2 --- /dev/null +++ b/build/pkgs/certifi/distros/arch.txt @@ -0,0 +1 @@ +python-certifi diff --git a/build/pkgs/certifi/distros/debian.txt b/build/pkgs/certifi/distros/debian.txt new file mode 100644 index 00000000000..f585a823bf3 --- /dev/null +++ b/build/pkgs/certifi/distros/debian.txt @@ -0,0 +1 @@ +python3-certifi diff --git a/build/pkgs/certifi/distros/fedora.txt b/build/pkgs/certifi/distros/fedora.txt new file mode 100644 index 00000000000..be421c8b4b2 --- /dev/null +++ b/build/pkgs/certifi/distros/fedora.txt @@ -0,0 +1 @@ +python-certifi diff --git a/build/pkgs/certifi/distros/gentoo.txt b/build/pkgs/certifi/distros/gentoo.txt new file mode 100644 index 00000000000..72e2e91c6ae --- /dev/null +++ b/build/pkgs/certifi/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/certifi diff --git a/build/pkgs/certifi/distros/opensuse.txt b/build/pkgs/certifi/distros/opensuse.txt index f585a823bf3..9f7a6b5c964 100644 --- a/build/pkgs/certifi/distros/opensuse.txt +++ b/build/pkgs/certifi/distros/opensuse.txt @@ -1 +1 @@ -python3-certifi +python3${PYTHON_MINOR}-certifi diff --git a/build/pkgs/certifi/spkg-configure.m4 b/build/pkgs/certifi/spkg-configure.m4 new file mode 100644 index 00000000000..ddd40613514 --- /dev/null +++ b/build/pkgs/certifi/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([certifi], [SAGE_PYTHON_PACKAGE_CHECK([certifi])]) diff --git a/build/pkgs/cffi/dependencies b/build/pkgs/cffi/dependencies index 9e4c266ad69..9af7c6ed3db 100644 --- a/build/pkgs/cffi/dependencies +++ b/build/pkgs/cffi/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) pycparser + | $(PYTHON_TOOLCHAIN) pycparser $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cffi/distros/gentoo.txt b/build/pkgs/cffi/distros/gentoo.txt new file mode 100644 index 00000000000..81eeb8108c7 --- /dev/null +++ b/build/pkgs/cffi/distros/gentoo.txt @@ -0,0 +1 @@ +virtual/python-cffi diff --git a/build/pkgs/cffi/distros/opensuse.txt b/build/pkgs/cffi/distros/opensuse.txt index 68ec4dda5ba..6bce4cd18b5 100644 --- a/build/pkgs/cffi/distros/opensuse.txt +++ b/build/pkgs/cffi/distros/opensuse.txt @@ -1 +1 @@ -python3-cffi +python3${PYTHON_MINOR}-cffi diff --git a/build/pkgs/cffi/spkg-configure.m4 b/build/pkgs/cffi/spkg-configure.m4 new file mode 100644 index 00000000000..dc81875927f --- /dev/null +++ b/build/pkgs/cffi/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([cffi], [SAGE_PYTHON_PACKAGE_CHECK([cffi])]) diff --git a/build/pkgs/charset_normalizer/dependencies b/build/pkgs/charset_normalizer/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/charset_normalizer/dependencies +++ b/build/pkgs/charset_normalizer/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/charset_normalizer/distros/gentoo.txt b/build/pkgs/charset_normalizer/distros/gentoo.txt new file mode 100644 index 00000000000..eefeb89e31e --- /dev/null +++ b/build/pkgs/charset_normalizer/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/charset_normalizer diff --git a/build/pkgs/charset_normalizer/spkg-configure.m4 b/build/pkgs/charset_normalizer/spkg-configure.m4 new file mode 100644 index 00000000000..18b18cf32b4 --- /dev/null +++ b/build/pkgs/charset_normalizer/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([charset_normalizer], [ + SAGE_PYTHON_PACKAGE_CHECK([charset_normalizer]) +]) diff --git a/build/pkgs/contourpy/dependencies b/build/pkgs/contourpy/dependencies index 0740ab1d4a7..d12b50bf33c 100644 --- a/build/pkgs/contourpy/dependencies +++ b/build/pkgs/contourpy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) numpy | $(PYTHON_TOOLCHAIN) pybind11 + numpy | $(PYTHON_TOOLCHAIN) pybind11 $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/conway_polynomials/dependencies b/build/pkgs/conway_polynomials/dependencies index 1700e743d59..6b134137610 100644 --- a/build/pkgs/conway_polynomials/dependencies +++ b/build/pkgs/conway_polynomials/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) +| $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cppy/dependencies b/build/pkgs/cppy/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/cppy/dependencies +++ b/build/pkgs/cppy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cppy/install-requires.txt b/build/pkgs/cppy/install-requires.txt index 9d2b4aaeee0..42667a30148 100644 --- a/build/pkgs/cppy/install-requires.txt +++ b/build/pkgs/cppy/install-requires.txt @@ -1 +1 @@ -cppy +cppy >=1.2.0 diff --git a/build/pkgs/cryptominisat/dependencies b/build/pkgs/cryptominisat/dependencies index 15e88888b6d..e30473e40f6 100644 --- a/build/pkgs/cryptominisat/dependencies +++ b/build/pkgs/cryptominisat/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) m4ri zlib libpng | cmake boost_cropped + m4ri zlib libpng | cmake boost_cropped $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cvxopt/dependencies b/build/pkgs/cvxopt/dependencies index d47ae01f215..33055fe8bf4 100644 --- a/build/pkgs/cvxopt/dependencies +++ b/build/pkgs/cvxopt/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig + numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cvxopt/distros/arch.txt b/build/pkgs/cvxopt/distros/arch.txt new file mode 100644 index 00000000000..f15770f0506 --- /dev/null +++ b/build/pkgs/cvxopt/distros/arch.txt @@ -0,0 +1 @@ +python-cvxopt diff --git a/build/pkgs/cvxopt/distros/debian.txt b/build/pkgs/cvxopt/distros/debian.txt new file mode 100644 index 00000000000..2bb6ad1e834 --- /dev/null +++ b/build/pkgs/cvxopt/distros/debian.txt @@ -0,0 +1 @@ +python3-cvxopt diff --git a/build/pkgs/cvxopt/distros/fedora.txt b/build/pkgs/cvxopt/distros/fedora.txt new file mode 100644 index 00000000000..f15770f0506 --- /dev/null +++ b/build/pkgs/cvxopt/distros/fedora.txt @@ -0,0 +1 @@ +python-cvxopt diff --git a/build/pkgs/cvxopt/distros/gentoo.txt b/build/pkgs/cvxopt/distros/gentoo.txt new file mode 100644 index 00000000000..b3123912bbe --- /dev/null +++ b/build/pkgs/cvxopt/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/cvxopt diff --git a/build/pkgs/cvxopt/distros/opensuse.txt b/build/pkgs/cvxopt/distros/opensuse.txt new file mode 100644 index 00000000000..e254c198706 --- /dev/null +++ b/build/pkgs/cvxopt/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-cvxopt diff --git a/build/pkgs/cvxopt/spkg-configure.m4 b/build/pkgs/cvxopt/spkg-configure.m4 new file mode 100644 index 00000000000..c4aa6198edb --- /dev/null +++ b/build/pkgs/cvxopt/spkg-configure.m4 @@ -0,0 +1,5 @@ +SAGE_SPKG_CONFIGURE([cvxopt], [ + SAGE_SPKG_DEPCHECK([gsl glpk suitesparse], [ + SAGE_PYTHON_PACKAGE_CHECK([cvxopt]) + ]) +]) diff --git a/build/pkgs/cvxpy/dependencies b/build/pkgs/cvxpy/dependencies index 540b44ff0f2..42cfab890cc 100644 --- a/build/pkgs/cvxpy/dependencies +++ b/build/pkgs/cvxpy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) numpy scipy glpk cvxopt osqp_python ecos_python scs | $(PYTHON_TOOLCHAIN) + numpy scipy glpk cvxopt osqp_python ecos_python scs | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cycler/dependencies b/build/pkgs/cycler/dependencies index 730af09b339..2218ed812dd 100644 --- a/build/pkgs/cycler/dependencies +++ b/build/pkgs/cycler/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) six | $(PYTHON_TOOLCHAIN) + six | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cycler/distros/arch.txt b/build/pkgs/cycler/distros/arch.txt new file mode 100644 index 00000000000..5727259aca6 --- /dev/null +++ b/build/pkgs/cycler/distros/arch.txt @@ -0,0 +1 @@ +python-cycler diff --git a/build/pkgs/cycler/distros/debian.txt b/build/pkgs/cycler/distros/debian.txt new file mode 100644 index 00000000000..c77685dd417 --- /dev/null +++ b/build/pkgs/cycler/distros/debian.txt @@ -0,0 +1 @@ +python3-cycler diff --git a/build/pkgs/cycler/distros/fedora.txt b/build/pkgs/cycler/distros/fedora.txt new file mode 100644 index 00000000000..5727259aca6 --- /dev/null +++ b/build/pkgs/cycler/distros/fedora.txt @@ -0,0 +1 @@ +python-cycler diff --git a/build/pkgs/cycler/distros/freebsd.txt b/build/pkgs/cycler/distros/freebsd.txt new file mode 100644 index 00000000000..6da1dabb333 --- /dev/null +++ b/build/pkgs/cycler/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-cycler diff --git a/build/pkgs/cycler/distros/gentoo.txt b/build/pkgs/cycler/distros/gentoo.txt new file mode 100644 index 00000000000..4b215438e8f --- /dev/null +++ b/build/pkgs/cycler/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/cycler diff --git a/build/pkgs/cycler/distros/opensuse.txt b/build/pkgs/cycler/distros/opensuse.txt new file mode 100644 index 00000000000..6aab7454acb --- /dev/null +++ b/build/pkgs/cycler/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-Cycler diff --git a/build/pkgs/cycler/spkg-configure.m4 b/build/pkgs/cycler/spkg-configure.m4 new file mode 100644 index 00000000000..239571a0f10 --- /dev/null +++ b/build/pkgs/cycler/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([cycler], [SAGE_PYTHON_PACKAGE_CHECK([cycler])]) diff --git a/build/pkgs/cylp/dependencies b/build/pkgs/cylp/dependencies index 3c541129eb9..d2c6405119d 100644 --- a/build/pkgs/cylp/dependencies +++ b/build/pkgs/cylp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) numpy scipy cbc | $(PYTHON_TOOLCHAIN) cython + numpy scipy cbc | $(PYTHON_TOOLCHAIN) cython $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cypari/dependencies b/build/pkgs/cypari/dependencies index 72b5af7ad81..69dfe7e7d8a 100644 --- a/build/pkgs/cypari/dependencies +++ b/build/pkgs/cypari/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython pari cysignals | $(PYTHON_TOOLCHAIN) + cython pari cysignals | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cysignals/dependencies b/build/pkgs/cysignals/dependencies index d3225d480f1..cd45ae2076c 100644 --- a/build/pkgs/cysignals/dependencies +++ b/build/pkgs/cysignals/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython pari | $(PYTHON_TOOLCHAIN) + cython pari | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cython/dependencies b/build/pkgs/cython/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/cython/dependencies +++ b/build/pkgs/cython/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/cython/distros/arch.txt b/build/pkgs/cython/distros/arch.txt new file mode 100644 index 00000000000..f6629e02456 --- /dev/null +++ b/build/pkgs/cython/distros/arch.txt @@ -0,0 +1 @@ +cython diff --git a/build/pkgs/cython/distros/debian.txt b/build/pkgs/cython/distros/debian.txt new file mode 100644 index 00000000000..f6629e02456 --- /dev/null +++ b/build/pkgs/cython/distros/debian.txt @@ -0,0 +1 @@ +cython diff --git a/build/pkgs/cython/distros/fedora.txt b/build/pkgs/cython/distros/fedora.txt new file mode 100644 index 00000000000..002d1b93c6f --- /dev/null +++ b/build/pkgs/cython/distros/fedora.txt @@ -0,0 +1 @@ +Cython diff --git a/build/pkgs/cython/distros/gentoo.txt b/build/pkgs/cython/distros/gentoo.txt new file mode 100644 index 00000000000..bb1512a15ba --- /dev/null +++ b/build/pkgs/cython/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/cython diff --git a/build/pkgs/cython/distros/opensuse.txt b/build/pkgs/cython/distros/opensuse.txt new file mode 100644 index 00000000000..09d8844feaf --- /dev/null +++ b/build/pkgs/cython/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-Cython diff --git a/build/pkgs/database_cubic_hecke/dependencies b/build/pkgs/database_cubic_hecke/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/database_cubic_hecke/dependencies +++ b/build/pkgs/database_cubic_hecke/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/database_knotinfo/dependencies b/build/pkgs/database_knotinfo/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/database_knotinfo/dependencies +++ b/build/pkgs/database_knotinfo/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/dateutil/dependencies b/build/pkgs/dateutil/dependencies index 7a972de985e..a90844872ae 100644 --- a/build/pkgs/dateutil/dependencies +++ b/build/pkgs/dateutil/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) six | $(PYTHON_TOOLCHAIN) + six | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/dateutil/distros/arch.txt b/build/pkgs/dateutil/distros/arch.txt new file mode 100644 index 00000000000..0f08daace31 --- /dev/null +++ b/build/pkgs/dateutil/distros/arch.txt @@ -0,0 +1 @@ +python-dateutil diff --git a/build/pkgs/dateutil/distros/debian.txt b/build/pkgs/dateutil/distros/debian.txt new file mode 100644 index 00000000000..2f46170765c --- /dev/null +++ b/build/pkgs/dateutil/distros/debian.txt @@ -0,0 +1 @@ +python3-dateutil diff --git a/build/pkgs/dateutil/distros/fedora.txt b/build/pkgs/dateutil/distros/fedora.txt new file mode 100644 index 00000000000..0f08daace31 --- /dev/null +++ b/build/pkgs/dateutil/distros/fedora.txt @@ -0,0 +1 @@ +python-dateutil diff --git a/build/pkgs/dateutil/distros/freebsd.txt b/build/pkgs/dateutil/distros/freebsd.txt new file mode 100644 index 00000000000..c336f5e0b1d --- /dev/null +++ b/build/pkgs/dateutil/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-dateutil diff --git a/build/pkgs/dateutil/distros/gentoo.txt b/build/pkgs/dateutil/distros/gentoo.txt new file mode 100644 index 00000000000..e129df768dc --- /dev/null +++ b/build/pkgs/dateutil/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/python-dateutil diff --git a/build/pkgs/dateutil/distros/opensuse.txt b/build/pkgs/dateutil/distros/opensuse.txt new file mode 100644 index 00000000000..ba37df671e5 --- /dev/null +++ b/build/pkgs/dateutil/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-python-dateutil diff --git a/build/pkgs/dateutil/install-requires.txt b/build/pkgs/dateutil/install-requires.txt index 0ae93da485e..face537605d 100644 --- a/build/pkgs/dateutil/install-requires.txt +++ b/build/pkgs/dateutil/install-requires.txt @@ -1 +1 @@ -dateutil >=2.8.1 +python-dateutil >=2.8.1 diff --git a/build/pkgs/dateutil/spkg-configure.m4 b/build/pkgs/dateutil/spkg-configure.m4 new file mode 100644 index 00000000000..fdcd1273975 --- /dev/null +++ b/build/pkgs/dateutil/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([dateutil], [SAGE_PYTHON_PACKAGE_CHECK([dateutil])]) diff --git a/build/pkgs/debugpy/dependencies b/build/pkgs/debugpy/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/debugpy/dependencies +++ b/build/pkgs/debugpy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/debugpy/distros/gentoo.txt b/build/pkgs/debugpy/distros/gentoo.txt new file mode 100644 index 00000000000..8b797ce715f --- /dev/null +++ b/build/pkgs/debugpy/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/debugpy diff --git a/build/pkgs/debugpy/spkg-configure.m4 b/build/pkgs/debugpy/spkg-configure.m4 new file mode 100644 index 00000000000..db605ff03c8 --- /dev/null +++ b/build/pkgs/debugpy/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([debugpy], [SAGE_PYTHON_PACKAGE_CHECK([debugpy])]) diff --git a/build/pkgs/decorator/dependencies b/build/pkgs/decorator/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/decorator/dependencies +++ b/build/pkgs/decorator/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/decorator/distros/arch.txt b/build/pkgs/decorator/distros/arch.txt new file mode 100644 index 00000000000..079560412f1 --- /dev/null +++ b/build/pkgs/decorator/distros/arch.txt @@ -0,0 +1 @@ +python-decorator diff --git a/build/pkgs/decorator/distros/debian.txt b/build/pkgs/decorator/distros/debian.txt new file mode 100644 index 00000000000..46c478e1513 --- /dev/null +++ b/build/pkgs/decorator/distros/debian.txt @@ -0,0 +1 @@ +python3-decorator diff --git a/build/pkgs/decorator/distros/fedora.txt b/build/pkgs/decorator/distros/fedora.txt new file mode 100644 index 00000000000..079560412f1 --- /dev/null +++ b/build/pkgs/decorator/distros/fedora.txt @@ -0,0 +1 @@ +python-decorator diff --git a/build/pkgs/decorator/distros/gentoo.txt b/build/pkgs/decorator/distros/gentoo.txt new file mode 100644 index 00000000000..fea5a67ac9e --- /dev/null +++ b/build/pkgs/decorator/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/decorator diff --git a/build/pkgs/decorator/distros/opensuse.txt b/build/pkgs/decorator/distros/opensuse.txt index 46c478e1513..4b9085da296 100644 --- a/build/pkgs/decorator/distros/opensuse.txt +++ b/build/pkgs/decorator/distros/opensuse.txt @@ -1 +1 @@ -python3-decorator +python3${PYTHON_MINOR}-decorator diff --git a/build/pkgs/decorator/spkg-configure.m4 b/build/pkgs/decorator/spkg-configure.m4 new file mode 100644 index 00000000000..e062778d6db --- /dev/null +++ b/build/pkgs/decorator/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([decorator], [SAGE_PYTHON_PACKAGE_CHECK([decorator])]) diff --git a/build/pkgs/defusedxml/dependencies b/build/pkgs/defusedxml/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/defusedxml/dependencies +++ b/build/pkgs/defusedxml/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/defusedxml/distros/gentoo.txt b/build/pkgs/defusedxml/distros/gentoo.txt new file mode 100644 index 00000000000..2804214449e --- /dev/null +++ b/build/pkgs/defusedxml/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/defusedxml diff --git a/build/pkgs/defusedxml/spkg-configure.m4 b/build/pkgs/defusedxml/spkg-configure.m4 new file mode 100644 index 00000000000..e02f34524ce --- /dev/null +++ b/build/pkgs/defusedxml/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([defusedxml], [SAGE_PYTHON_PACKAGE_CHECK([defusedxml])]) diff --git a/build/pkgs/deprecation/dependencies b/build/pkgs/deprecation/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/deprecation/dependencies +++ b/build/pkgs/deprecation/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/distlib/dependencies b/build/pkgs/distlib/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/distlib/dependencies +++ b/build/pkgs/distlib/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/docutils/dependencies b/build/pkgs/docutils/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/docutils/dependencies +++ b/build/pkgs/docutils/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/docutils/distros/gentoo.txt b/build/pkgs/docutils/distros/gentoo.txt new file mode 100644 index 00000000000..fe4a4524cbb --- /dev/null +++ b/build/pkgs/docutils/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/docutils diff --git a/build/pkgs/docutils/distros/opensuse.txt b/build/pkgs/docutils/distros/opensuse.txt index a4bb792a5a4..a7fcdac14ef 100644 --- a/build/pkgs/docutils/distros/opensuse.txt +++ b/build/pkgs/docutils/distros/opensuse.txt @@ -1 +1 @@ -python3-docutils +python3${PYTHON_MINOR}-docutils diff --git a/build/pkgs/docutils/spkg-configure.m4 b/build/pkgs/docutils/spkg-configure.m4 new file mode 100644 index 00000000000..3584e4513c6 --- /dev/null +++ b/build/pkgs/docutils/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([docutils], [SAGE_PYTHON_PACKAGE_CHECK([docutils])]) diff --git a/build/pkgs/dot2tex/dependencies b/build/pkgs/dot2tex/dependencies index c1925d16b73..75d8c64edb5 100644 --- a/build/pkgs/dot2tex/dependencies +++ b/build/pkgs/dot2tex/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) pyparsing + | $(PYTHON_TOOLCHAIN) pyparsing $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ecos_python/dependencies b/build/pkgs/ecos_python/dependencies index ecd3af7675b..aaf3b261709 100644 --- a/build/pkgs/ecos_python/dependencies +++ b/build/pkgs/ecos_python/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) numpy scipy | $(PYTHON_TOOLCHAIN) + numpy scipy | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/editables/dependencies b/build/pkgs/editables/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/editables/dependencies +++ b/build/pkgs/editables/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/elliptic_curves/dependencies b/build/pkgs/elliptic_curves/dependencies index 6b134137610..3518086ab84 100644 --- a/build/pkgs/elliptic_curves/dependencies +++ b/build/pkgs/elliptic_curves/dependencies @@ -1,4 +1,4 @@ -| $(PYTHON) +| $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/entrypoints/dependencies b/build/pkgs/entrypoints/dependencies index 902a5feed13..4fedbe70cd1 100644 --- a/build/pkgs/entrypoints/dependencies +++ b/build/pkgs/entrypoints/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli + | $(PYTHON_TOOLCHAIN) flit_core tomli $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/entrypoints/distros/gentoo.txt b/build/pkgs/entrypoints/distros/gentoo.txt new file mode 100644 index 00000000000..684ddd036ee --- /dev/null +++ b/build/pkgs/entrypoints/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/entrypoints diff --git a/build/pkgs/entrypoints/spkg-configure.m4 b/build/pkgs/entrypoints/spkg-configure.m4 new file mode 100644 index 00000000000..caed658b69a --- /dev/null +++ b/build/pkgs/entrypoints/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([entrypoints], [SAGE_PYTHON_PACKAGE_CHECK([entrypoints])]) diff --git a/build/pkgs/executing/dependencies b/build/pkgs/executing/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/executing/dependencies +++ b/build/pkgs/executing/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/fastjsonschema/dependencies b/build/pkgs/fastjsonschema/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/fastjsonschema/dependencies +++ b/build/pkgs/fastjsonschema/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/filelock/dependencies b/build/pkgs/filelock/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/filelock/dependencies +++ b/build/pkgs/filelock/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/flit_core/dependencies b/build/pkgs/flit_core/dependencies index 93c460228b4..644ad35f773 100644 --- a/build/pkgs/flit_core/dependencies +++ b/build/pkgs/flit_core/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip + | pip $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/flit_core/distros/gentoo.txt b/build/pkgs/flit_core/distros/gentoo.txt new file mode 100644 index 00000000000..fe6bea92362 --- /dev/null +++ b/build/pkgs/flit_core/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/flit_core diff --git a/build/pkgs/flit_core/install-requires.txt b/build/pkgs/flit_core/install-requires.txt index 14ccfd92035..88b912bf11a 100644 --- a/build/pkgs/flit_core/install-requires.txt +++ b/build/pkgs/flit_core/install-requires.txt @@ -1 +1 @@ -flit-core +flit-core >= 3.7.1 diff --git a/build/pkgs/flit_core/spkg-configure.m4 b/build/pkgs/flit_core/spkg-configure.m4 new file mode 100644 index 00000000000..ee67557024f --- /dev/null +++ b/build/pkgs/flit_core/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([flit_core], [SAGE_PYTHON_PACKAGE_CHECK([flit_core])]) diff --git a/build/pkgs/fonttools/dependencies b/build/pkgs/fonttools/dependencies index 9c736669d9a..909380550a2 100644 --- a/build/pkgs/fonttools/dependencies +++ b/build/pkgs/fonttools/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) cython + | $(PYTHON_TOOLCHAIN) cython $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/fpylll/dependencies b/build/pkgs/fpylll/dependencies index 4b4fb1b44fb..4837249bcfa 100644 --- a/build/pkgs/fpylll/dependencies +++ b/build/pkgs/fpylll/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython cysignals numpy fplll + cython cysignals numpy fplll | $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/furo/dependencies b/build/pkgs/furo/dependencies index fec067b2058..07434099dee 100644 --- a/build/pkgs/furo/dependencies +++ b/build/pkgs/furo/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) beautifulsoup4 sphinx pygments sphinx_basic_ng | $(PYTHON_TOOLCHAIN) + beautifulsoup4 sphinx pygments sphinx_basic_ng | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/gambit/dependencies b/build/pkgs/gambit/dependencies index 1f00cbf5321..e026bfaacf9 100644 --- a/build/pkgs/gambit/dependencies +++ b/build/pkgs/gambit/dependencies @@ -1,4 +1,4 @@ -cython | $(PYTHON_TOOLCHAIN) +cython | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/gap_jupyter/dependencies b/build/pkgs/gap_jupyter/dependencies index 41133c3ff0a..89f9b88dd92 100644 --- a/build/pkgs/gap_jupyter/dependencies +++ b/build/pkgs/gap_jupyter/dependencies @@ -1 +1 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) ipython gap + | $(PYTHON_TOOLCHAIN) ipython gap $(PYTHON) diff --git a/build/pkgs/gast/dependencies b/build/pkgs/gast/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/gast/dependencies +++ b/build/pkgs/gast/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/gast/distros/gentoo.txt b/build/pkgs/gast/distros/gentoo.txt new file mode 100644 index 00000000000..3be5e7e785c --- /dev/null +++ b/build/pkgs/gast/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/gast diff --git a/build/pkgs/gast/spkg-configure.m4 b/build/pkgs/gast/spkg-configure.m4 new file mode 100644 index 00000000000..26ec59feaee --- /dev/null +++ b/build/pkgs/gast/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([gast], [SAGE_PYTHON_PACKAGE_CHECK([gast])]) diff --git a/build/pkgs/gdb/dependencies b/build/pkgs/gdb/dependencies index bdf81f77180..cf6822bb92e 100644 --- a/build/pkgs/gdb/dependencies +++ b/build/pkgs/gdb/dependencies @@ -1,4 +1,4 @@ -mpfr zlib ncurses $(PYTHON) xz +mpfr zlib ncurses xz | $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/gitpython/dependencies b/build/pkgs/gitpython/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/gitpython/dependencies +++ b/build/pkgs/gitpython/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/gmpy2/dependencies b/build/pkgs/gmpy2/dependencies index 98c6065dc87..b1f92b9241d 100644 --- a/build/pkgs/gmpy2/dependencies +++ b/build/pkgs/gmpy2/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) $(MP_LIBRARY) mpfr mpc | $(PYTHON_TOOLCHAIN) + $(MP_LIBRARY) mpfr mpc | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/gmpy2/distros/arch.txt b/build/pkgs/gmpy2/distros/arch.txt new file mode 100644 index 00000000000..d4464a5ce2c --- /dev/null +++ b/build/pkgs/gmpy2/distros/arch.txt @@ -0,0 +1 @@ +python-gmpy2 diff --git a/build/pkgs/gmpy2/distros/debian.txt b/build/pkgs/gmpy2/distros/debian.txt new file mode 100644 index 00000000000..afdd6281722 --- /dev/null +++ b/build/pkgs/gmpy2/distros/debian.txt @@ -0,0 +1 @@ +python3-gmpy2 diff --git a/build/pkgs/gmpy2/distros/fedora.txt b/build/pkgs/gmpy2/distros/fedora.txt new file mode 100644 index 00000000000..d4464a5ce2c --- /dev/null +++ b/build/pkgs/gmpy2/distros/fedora.txt @@ -0,0 +1 @@ +python-gmpy2 diff --git a/build/pkgs/gmpy2/distros/freebsd.txt b/build/pkgs/gmpy2/distros/freebsd.txt new file mode 100644 index 00000000000..0d9d2c435a6 --- /dev/null +++ b/build/pkgs/gmpy2/distros/freebsd.txt @@ -0,0 +1 @@ +math/py-gmpy2 diff --git a/build/pkgs/gmpy2/distros/gentoo.txt b/build/pkgs/gmpy2/distros/gentoo.txt new file mode 100644 index 00000000000..519f9d8729a --- /dev/null +++ b/build/pkgs/gmpy2/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/gmpy diff --git a/build/pkgs/gmpy2/distros/opensuse.txt b/build/pkgs/gmpy2/distros/opensuse.txt new file mode 100644 index 00000000000..36d52b88ba6 --- /dev/null +++ b/build/pkgs/gmpy2/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-gmpy2 diff --git a/build/pkgs/hatch_fancy_pypi_readme/dependencies b/build/pkgs/hatch_fancy_pypi_readme/dependencies index 8cd44d06682..cfb7c484697 100644 --- a/build/pkgs/hatch_fancy_pypi_readme/dependencies +++ b/build/pkgs/hatch_fancy_pypi_readme/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) hatchling + | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/hatch_nodejs_version/dependencies b/build/pkgs/hatch_nodejs_version/dependencies index e9293f104ca..85e8893f785 100644 --- a/build/pkgs/hatch_nodejs_version/dependencies +++ b/build/pkgs/hatch_nodejs_version/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) hatchling | $(PYTHON_TOOLCHAIN) + hatchling | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/hatch_vcs/dependencies b/build/pkgs/hatch_vcs/dependencies index 8cd44d06682..cfb7c484697 100644 --- a/build/pkgs/hatch_vcs/dependencies +++ b/build/pkgs/hatch_vcs/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) hatchling + | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/hatchling/dependencies b/build/pkgs/hatchling/dependencies index 84b5ea48ccc..4c10ae56e2e 100644 --- a/build/pkgs/hatchling/dependencies +++ b/build/pkgs/hatchling/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pathspec tomli editables pluggy packaging | $(PYTHON_TOOLCHAIN) + pathspec tomli editables pluggy packaging | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/html5lib/dependencies b/build/pkgs/html5lib/dependencies index 89200065387..7ebee8487db 100644 --- a/build/pkgs/html5lib/dependencies +++ b/build/pkgs/html5lib/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) webencodings | $(PYTHON_TOOLCHAIN) + webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/html5lib/distros/arch.txt b/build/pkgs/html5lib/distros/arch.txt new file mode 100644 index 00000000000..b821491e116 --- /dev/null +++ b/build/pkgs/html5lib/distros/arch.txt @@ -0,0 +1 @@ +python-html5lib diff --git a/build/pkgs/html5lib/distros/debian.txt b/build/pkgs/html5lib/distros/debian.txt new file mode 100644 index 00000000000..6d7b8dfb001 --- /dev/null +++ b/build/pkgs/html5lib/distros/debian.txt @@ -0,0 +1 @@ +python3-html5lib diff --git a/build/pkgs/html5lib/distros/fedora.txt b/build/pkgs/html5lib/distros/fedora.txt new file mode 100644 index 00000000000..b821491e116 --- /dev/null +++ b/build/pkgs/html5lib/distros/fedora.txt @@ -0,0 +1 @@ +python-html5lib diff --git a/build/pkgs/html5lib/distros/gentoo.txt b/build/pkgs/html5lib/distros/gentoo.txt new file mode 100644 index 00000000000..6c2be76429c --- /dev/null +++ b/build/pkgs/html5lib/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/html5lib diff --git a/build/pkgs/html5lib/distros/opensuse.txt b/build/pkgs/html5lib/distros/opensuse.txt new file mode 100644 index 00000000000..99d5afb4a02 --- /dev/null +++ b/build/pkgs/html5lib/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-html5lib diff --git a/build/pkgs/html5lib/spkg-configure.m4 b/build/pkgs/html5lib/spkg-configure.m4 new file mode 100644 index 00000000000..f421b7e87db --- /dev/null +++ b/build/pkgs/html5lib/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([html5lib], [SAGE_PYTHON_PACKAGE_CHECK([html5lib])]) diff --git a/build/pkgs/idna/dependencies b/build/pkgs/idna/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/idna/dependencies +++ b/build/pkgs/idna/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/idna/distros/arch.txt b/build/pkgs/idna/distros/arch.txt new file mode 100644 index 00000000000..a73e70cade0 --- /dev/null +++ b/build/pkgs/idna/distros/arch.txt @@ -0,0 +1 @@ +python-idna diff --git a/build/pkgs/idna/distros/debian.txt b/build/pkgs/idna/distros/debian.txt new file mode 100644 index 00000000000..de48e70887b --- /dev/null +++ b/build/pkgs/idna/distros/debian.txt @@ -0,0 +1 @@ +python3-idna diff --git a/build/pkgs/idna/distros/fedora.txt b/build/pkgs/idna/distros/fedora.txt new file mode 100644 index 00000000000..a73e70cade0 --- /dev/null +++ b/build/pkgs/idna/distros/fedora.txt @@ -0,0 +1 @@ +python-idna diff --git a/build/pkgs/idna/distros/gentoo.txt b/build/pkgs/idna/distros/gentoo.txt new file mode 100644 index 00000000000..68ef51c453e --- /dev/null +++ b/build/pkgs/idna/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/idna diff --git a/build/pkgs/idna/distros/opensuse.txt b/build/pkgs/idna/distros/opensuse.txt new file mode 100644 index 00000000000..ea8400fa563 --- /dev/null +++ b/build/pkgs/idna/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-idna diff --git a/build/pkgs/idna/spkg-configure.m4 b/build/pkgs/idna/spkg-configure.m4 new file mode 100644 index 00000000000..9d363f212e6 --- /dev/null +++ b/build/pkgs/idna/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([idna], [SAGE_PYTHON_PACKAGE_CHECK([idna])]) diff --git a/build/pkgs/imagesize/dependencies b/build/pkgs/imagesize/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/imagesize/dependencies +++ b/build/pkgs/imagesize/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/imagesize/distros/gentoo.txt b/build/pkgs/imagesize/distros/gentoo.txt new file mode 100644 index 00000000000..54350ba2642 --- /dev/null +++ b/build/pkgs/imagesize/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/imagesize diff --git a/build/pkgs/imagesize/spkg-configure.m4 b/build/pkgs/imagesize/spkg-configure.m4 new file mode 100644 index 00000000000..20210eff2f0 --- /dev/null +++ b/build/pkgs/imagesize/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([imagesize], [SAGE_PYTHON_PACKAGE_CHECK([imagesize])]) diff --git a/build/pkgs/importlib_metadata/dependencies b/build/pkgs/importlib_metadata/dependencies index 77aa2a42f93..3c8d3aeb24e 100644 --- a/build/pkgs/importlib_metadata/dependencies +++ b/build/pkgs/importlib_metadata/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) zipp typing_extensions | $(PYTHON_TOOLCHAIN) tomli + zipp typing_extensions | $(PYTHON_TOOLCHAIN) tomli $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/importlib_metadata/distros/arch.txt b/build/pkgs/importlib_metadata/distros/arch.txt new file mode 100644 index 00000000000..b3c206287ec --- /dev/null +++ b/build/pkgs/importlib_metadata/distros/arch.txt @@ -0,0 +1 @@ +python-importlib-metadata diff --git a/build/pkgs/importlib_metadata/distros/debian.txt b/build/pkgs/importlib_metadata/distros/debian.txt new file mode 100644 index 00000000000..c005bf38793 --- /dev/null +++ b/build/pkgs/importlib_metadata/distros/debian.txt @@ -0,0 +1 @@ +python3-importlib-metadata diff --git a/build/pkgs/importlib_metadata/distros/fedora.txt b/build/pkgs/importlib_metadata/distros/fedora.txt new file mode 100644 index 00000000000..b3c206287ec --- /dev/null +++ b/build/pkgs/importlib_metadata/distros/fedora.txt @@ -0,0 +1 @@ +python-importlib-metadata diff --git a/build/pkgs/importlib_metadata/distros/freebsd.txt b/build/pkgs/importlib_metadata/distros/freebsd.txt new file mode 100644 index 00000000000..23518da7cff --- /dev/null +++ b/build/pkgs/importlib_metadata/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-importlib-metadata diff --git a/build/pkgs/importlib_metadata/distros/gentoo.txt b/build/pkgs/importlib_metadata/distros/gentoo.txt new file mode 100644 index 00000000000..4f927864c2b --- /dev/null +++ b/build/pkgs/importlib_metadata/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/importlib_metadata diff --git a/build/pkgs/importlib_metadata/distros/opensuse.txt b/build/pkgs/importlib_metadata/distros/opensuse.txt new file mode 100644 index 00000000000..7a665131cd4 --- /dev/null +++ b/build/pkgs/importlib_metadata/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-importlib-metadata diff --git a/build/pkgs/importlib_metadata/spkg-configure.m4 b/build/pkgs/importlib_metadata/spkg-configure.m4 new file mode 100644 index 00000000000..0554e522252 --- /dev/null +++ b/build/pkgs/importlib_metadata/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([importlib_metadata], [ + SAGE_PYTHON_PACKAGE_CHECK([importlib_metadata]) +]) diff --git a/build/pkgs/importlib_resources/dependencies b/build/pkgs/importlib_resources/dependencies index 58927ab6f75..655283898b7 100644 --- a/build/pkgs/importlib_resources/dependencies +++ b/build/pkgs/importlib_resources/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) zipp | $(PYTHON_TOOLCHAIN) + zipp | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/importlib_resources/distros/gentoo.txt b/build/pkgs/importlib_resources/distros/gentoo.txt new file mode 100644 index 00000000000..d5e1f2cf6a8 --- /dev/null +++ b/build/pkgs/importlib_resources/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/importlib_resources diff --git a/build/pkgs/importlib_resources/spkg-configure.m4 b/build/pkgs/importlib_resources/spkg-configure.m4 new file mode 100644 index 00000000000..50df55b4643 --- /dev/null +++ b/build/pkgs/importlib_resources/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([importlib_resources], [ + SAGE_PYTHON_PACKAGE_CHECK([importlib_resources]) +]) diff --git a/build/pkgs/ipykernel/dependencies b/build/pkgs/ipykernel/dependencies index 792c3e70634..7e153a0cb46 100644 --- a/build/pkgs/ipykernel/dependencies +++ b/build/pkgs/ipykernel/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) ipython_genutils importlib_metadata matplotlib_inline ipython jupyter_client tornado appnope traitlets executing | $(PYTHON_TOOLCHAIN) + ipython_genutils importlib_metadata matplotlib_inline ipython jupyter_client tornado appnope traitlets executing | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ipykernel/distros/arch.txt b/build/pkgs/ipykernel/distros/arch.txt new file mode 100644 index 00000000000..286458797f7 --- /dev/null +++ b/build/pkgs/ipykernel/distros/arch.txt @@ -0,0 +1 @@ +python-ipykernel diff --git a/build/pkgs/ipykernel/distros/debian.txt b/build/pkgs/ipykernel/distros/debian.txt new file mode 100644 index 00000000000..d919f6f3190 --- /dev/null +++ b/build/pkgs/ipykernel/distros/debian.txt @@ -0,0 +1 @@ +ipykernel diff --git a/build/pkgs/ipykernel/distros/fedora.txt b/build/pkgs/ipykernel/distros/fedora.txt new file mode 100644 index 00000000000..286458797f7 --- /dev/null +++ b/build/pkgs/ipykernel/distros/fedora.txt @@ -0,0 +1 @@ +python-ipykernel diff --git a/build/pkgs/ipykernel/distros/freebsd.txt b/build/pkgs/ipykernel/distros/freebsd.txt new file mode 100644 index 00000000000..92235f132be --- /dev/null +++ b/build/pkgs/ipykernel/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-ipykernel diff --git a/build/pkgs/ipykernel/distros/gentoo.txt b/build/pkgs/ipykernel/distros/gentoo.txt new file mode 100644 index 00000000000..88aab61ef39 --- /dev/null +++ b/build/pkgs/ipykernel/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/ipykernel diff --git a/build/pkgs/ipykernel/distros/opensuse.txt b/build/pkgs/ipykernel/distros/opensuse.txt new file mode 100644 index 00000000000..1485db27e0d --- /dev/null +++ b/build/pkgs/ipykernel/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-ipykernel diff --git a/build/pkgs/ipykernel/spkg-configure.m4 b/build/pkgs/ipykernel/spkg-configure.m4 new file mode 100644 index 00000000000..94ecc2dcc4e --- /dev/null +++ b/build/pkgs/ipykernel/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([ipykernel], [SAGE_PYTHON_PACKAGE_CHECK([ipykernel])]) diff --git a/build/pkgs/ipympl/dependencies b/build/pkgs/ipympl/dependencies index 05d47407b15..90b85bcfdbc 100644 --- a/build/pkgs/ipympl/dependencies +++ b/build/pkgs/ipympl/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) ipywidgets matplotlib ipykernel | $(PYTHON_TOOLCHAIN) jupyter_packaging + ipywidgets matplotlib ipykernel | $(PYTHON_TOOLCHAIN) jupyter_packaging $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ipython/dependencies b/build/pkgs/ipython/dependencies index 38dad7b80ee..48ad216441c 100644 --- a/build/pkgs/ipython/dependencies +++ b/build/pkgs/ipython/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) jinja2 tornado pyzmq pickleshare simplegeneric traitlets decorator wcwidth prompt_toolkit pygments pexpect appnope backcall jedi stack_data | $(PYTHON_TOOLCHAIN) + jinja2 tornado pyzmq pickleshare simplegeneric traitlets decorator wcwidth prompt_toolkit pygments pexpect appnope backcall jedi stack_data | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ipython/distros/arch.txt b/build/pkgs/ipython/distros/arch.txt new file mode 100644 index 00000000000..49a7ffe2a95 --- /dev/null +++ b/build/pkgs/ipython/distros/arch.txt @@ -0,0 +1 @@ +ipython diff --git a/build/pkgs/ipython/distros/debian.txt b/build/pkgs/ipython/distros/debian.txt new file mode 100644 index 00000000000..c32c6b449cf --- /dev/null +++ b/build/pkgs/ipython/distros/debian.txt @@ -0,0 +1 @@ +python3-ipython diff --git a/build/pkgs/ipython/distros/fedora.txt b/build/pkgs/ipython/distros/fedora.txt new file mode 100644 index 00000000000..49a7ffe2a95 --- /dev/null +++ b/build/pkgs/ipython/distros/fedora.txt @@ -0,0 +1 @@ +ipython diff --git a/build/pkgs/ipython/distros/freebsd.txt b/build/pkgs/ipython/distros/freebsd.txt new file mode 100644 index 00000000000..3252ee7fbc1 --- /dev/null +++ b/build/pkgs/ipython/distros/freebsd.txt @@ -0,0 +1 @@ +devel/ipython diff --git a/build/pkgs/ipython/distros/gentoo.txt b/build/pkgs/ipython/distros/gentoo.txt new file mode 100644 index 00000000000..8b76f186ff8 --- /dev/null +++ b/build/pkgs/ipython/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/ipython diff --git a/build/pkgs/ipython/distros/opensuse.txt b/build/pkgs/ipython/distros/opensuse.txt index c32c6b449cf..32aac30ae1e 100644 --- a/build/pkgs/ipython/distros/opensuse.txt +++ b/build/pkgs/ipython/distros/opensuse.txt @@ -1 +1 @@ -python3-ipython +python3${PYTHON_MINOR}-ipython diff --git a/build/pkgs/ipython/install-requires.txt b/build/pkgs/ipython/install-requires.txt index a52df49c421..03d4a4f3413 100644 --- a/build/pkgs/ipython/install-requires.txt +++ b/build/pkgs/ipython/install-requires.txt @@ -1 +1,2 @@ -ipython >=7.13.0 +ipython >=7.13.0, <8.9.0 +# ipython >= 8.9.0 requires prompt_toolkit too new for Sage diff --git a/build/pkgs/ipython/spkg-configure.m4 b/build/pkgs/ipython/spkg-configure.m4 new file mode 100644 index 00000000000..02ab89f5193 --- /dev/null +++ b/build/pkgs/ipython/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([ipython], [SAGE_PYTHON_PACKAGE_CHECK([ipython])]) diff --git a/build/pkgs/ipython_genutils/dependencies b/build/pkgs/ipython_genutils/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/ipython_genutils/dependencies +++ b/build/pkgs/ipython_genutils/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ipython_genutils/distros/gentoo.txt b/build/pkgs/ipython_genutils/distros/gentoo.txt new file mode 100644 index 00000000000..01bc49d4e1a --- /dev/null +++ b/build/pkgs/ipython_genutils/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/ipython_genutils diff --git a/build/pkgs/ipython_genutils/spkg-configure.m4 b/build/pkgs/ipython_genutils/spkg-configure.m4 new file mode 100644 index 00000000000..b0ba86ac7a3 --- /dev/null +++ b/build/pkgs/ipython_genutils/spkg-configure.m4 @@ -0,0 +1,4 @@ +SAGE_SPKG_CONFIGURE( + [ipython_genutils], + [SAGE_PYTHON_PACKAGE_CHECK([ipython_genutils])] +) diff --git a/build/pkgs/ipywidgets/dependencies b/build/pkgs/ipywidgets/dependencies index 64f5151c754..bcb4e030b7d 100644 --- a/build/pkgs/ipywidgets/dependencies +++ b/build/pkgs/ipywidgets/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) widgetsnbextension jupyterlab_widgets | $(PYTHON_TOOLCHAIN) ipykernel ipython traitlets + widgetsnbextension jupyterlab_widgets | $(PYTHON_TOOLCHAIN) ipykernel ipython traitlets $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ipywidgets/distros/gentoo.txt b/build/pkgs/ipywidgets/distros/gentoo.txt new file mode 100644 index 00000000000..7c76967c65b --- /dev/null +++ b/build/pkgs/ipywidgets/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/ipywidgets diff --git a/build/pkgs/ipywidgets/spkg-configure.m4 b/build/pkgs/ipywidgets/spkg-configure.m4 new file mode 100644 index 00000000000..51ca9be74db --- /dev/null +++ b/build/pkgs/ipywidgets/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([ipywidgets], [SAGE_PYTHON_PACKAGE_CHECK([ipywidgets])]) diff --git a/build/pkgs/jedi/dependencies b/build/pkgs/jedi/dependencies index 60b5f820a37..0e2212bd149 100644 --- a/build/pkgs/jedi/dependencies +++ b/build/pkgs/jedi/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) parso | $(PYTHON_TOOLCHAIN) + parso | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jedi/distros/gentoo.txt b/build/pkgs/jedi/distros/gentoo.txt new file mode 100644 index 00000000000..6c85a46cfcb --- /dev/null +++ b/build/pkgs/jedi/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/jedi diff --git a/build/pkgs/jedi/spkg-configure.m4 b/build/pkgs/jedi/spkg-configure.m4 new file mode 100644 index 00000000000..a37dbcc92db --- /dev/null +++ b/build/pkgs/jedi/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([jedi], [SAGE_PYTHON_PACKAGE_CHECK([jedi])]) diff --git a/build/pkgs/jinja2/dependencies b/build/pkgs/jinja2/dependencies index 6947978ec42..151ae9767d1 100644 --- a/build/pkgs/jinja2/dependencies +++ b/build/pkgs/jinja2/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) markupsafe docutils | $(PYTHON_TOOLCHAIN) + markupsafe docutils | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jinja2/distros/debian.txt b/build/pkgs/jinja2/distros/debian.txt new file mode 100644 index 00000000000..f2db865ab36 --- /dev/null +++ b/build/pkgs/jinja2/distros/debian.txt @@ -0,0 +1 @@ +python3-jinja2 diff --git a/build/pkgs/jinja2/distros/fedora.txt b/build/pkgs/jinja2/distros/fedora.txt new file mode 100644 index 00000000000..f5f3caf99cc --- /dev/null +++ b/build/pkgs/jinja2/distros/fedora.txt @@ -0,0 +1 @@ +python-jinja2 diff --git a/build/pkgs/jinja2/distros/gentoo.txt b/build/pkgs/jinja2/distros/gentoo.txt new file mode 100644 index 00000000000..15a27aecd44 --- /dev/null +++ b/build/pkgs/jinja2/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/jinja diff --git a/build/pkgs/jinja2/distros/opensuse.txt b/build/pkgs/jinja2/distros/opensuse.txt index 5d90a223f55..8ad585a7ef3 100644 --- a/build/pkgs/jinja2/distros/opensuse.txt +++ b/build/pkgs/jinja2/distros/opensuse.txt @@ -1 +1 @@ -python3-Jinja2 +python3${PYTHON_MINOR}-jinja2 diff --git a/build/pkgs/jinja2/install-requires.txt b/build/pkgs/jinja2/install-requires.txt index 99d8e6ecd6e..829d4c266d3 100644 --- a/build/pkgs/jinja2/install-requires.txt +++ b/build/pkgs/jinja2/install-requires.txt @@ -1 +1,2 @@ -jinja2 >=2.11.2 +jinja2 >=3.0 +# for sphinx diff --git a/build/pkgs/jinja2/spkg-configure.m4 b/build/pkgs/jinja2/spkg-configure.m4 new file mode 100644 index 00000000000..0970d1c8bea --- /dev/null +++ b/build/pkgs/jinja2/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([jinja2], [SAGE_PYTHON_PACKAGE_CHECK([jinja2])]) diff --git a/build/pkgs/jsonschema/dependencies b/build/pkgs/jsonschema/dependencies index 51698156cf0..d0211604157 100644 --- a/build/pkgs/jsonschema/dependencies +++ b/build/pkgs/jsonschema/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs hatch_fancy_pypi_readme + vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs hatch_fancy_pypi_readme $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jsonschema/distros/arch.txt b/build/pkgs/jsonschema/distros/arch.txt new file mode 100644 index 00000000000..8943c30f9ed --- /dev/null +++ b/build/pkgs/jsonschema/distros/arch.txt @@ -0,0 +1 @@ +python-jsonschema diff --git a/build/pkgs/jsonschema/distros/debian.txt b/build/pkgs/jsonschema/distros/debian.txt new file mode 100644 index 00000000000..047e6cc5d1d --- /dev/null +++ b/build/pkgs/jsonschema/distros/debian.txt @@ -0,0 +1 @@ +python3-jsonschema diff --git a/build/pkgs/jsonschema/distros/fedora.txt b/build/pkgs/jsonschema/distros/fedora.txt new file mode 100644 index 00000000000..8943c30f9ed --- /dev/null +++ b/build/pkgs/jsonschema/distros/fedora.txt @@ -0,0 +1 @@ +python-jsonschema diff --git a/build/pkgs/jsonschema/distros/gentoo.txt b/build/pkgs/jsonschema/distros/gentoo.txt new file mode 100644 index 00000000000..d708e4c9990 --- /dev/null +++ b/build/pkgs/jsonschema/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/jsonschema diff --git a/build/pkgs/jsonschema/distros/opensuse.txt b/build/pkgs/jsonschema/distros/opensuse.txt index 047e6cc5d1d..2a587a55946 100644 --- a/build/pkgs/jsonschema/distros/opensuse.txt +++ b/build/pkgs/jsonschema/distros/opensuse.txt @@ -1 +1 @@ -python3-jsonschema +python3${PYTHON_MINOR}-jsonschema diff --git a/build/pkgs/jsonschema/spkg-configure.m4 b/build/pkgs/jsonschema/spkg-configure.m4 new file mode 100644 index 00000000000..b9e5e216a3b --- /dev/null +++ b/build/pkgs/jsonschema/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([jsonschema], [SAGE_PYTHON_PACKAGE_CHECK([jsonschema])]) diff --git a/build/pkgs/jupymake/dependencies b/build/pkgs/jupymake/dependencies index c8ed956ad6a..aa714006aae 100644 --- a/build/pkgs/jupymake/dependencies +++ b/build/pkgs/jupymake/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) polymake | $(PYTHON_TOOLCHAIN) + polymake | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyter_client/dependencies b/build/pkgs/jupyter_client/dependencies index 29d5d3b6bf3..dcc8c256fad 100644 --- a/build/pkgs/jupyter_client/dependencies +++ b/build/pkgs/jupyter_client/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints hatchling + jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyter_client/distros/gentoo.txt b/build/pkgs/jupyter_client/distros/gentoo.txt new file mode 100644 index 00000000000..4f1de883ca1 --- /dev/null +++ b/build/pkgs/jupyter_client/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/jupyter_client diff --git a/build/pkgs/jupyter_client/distros/opensuse.txt b/build/pkgs/jupyter_client/distros/opensuse.txt index 0159b2d7b90..a1e21956a79 100644 --- a/build/pkgs/jupyter_client/distros/opensuse.txt +++ b/build/pkgs/jupyter_client/distros/opensuse.txt @@ -1 +1 @@ -python3-jupyter-client +python3${PYTHON_MINOR}-jupyter-client diff --git a/build/pkgs/jupyter_client/spkg-configure.m4 b/build/pkgs/jupyter_client/spkg-configure.m4 new file mode 100644 index 00000000000..fbd34982c14 --- /dev/null +++ b/build/pkgs/jupyter_client/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([jupyter_client], [ + SAGE_PYTHON_PACKAGE_CHECK([jupyter_client]) +]) diff --git a/build/pkgs/jupyter_core/dependencies b/build/pkgs/jupyter_core/dependencies index 6aeda10f20d..a312196cbed 100644 --- a/build/pkgs/jupyter_core/dependencies +++ b/build/pkgs/jupyter_core/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) traitlets + traitlets | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyter_core/distros/gentoo.txt b/build/pkgs/jupyter_core/distros/gentoo.txt new file mode 100644 index 00000000000..f168c5ad7ad --- /dev/null +++ b/build/pkgs/jupyter_core/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/jupyter_core diff --git a/build/pkgs/jupyter_core/distros/opensuse.txt b/build/pkgs/jupyter_core/distros/opensuse.txt index 2f316f2ee07..2c677674477 100644 --- a/build/pkgs/jupyter_core/distros/opensuse.txt +++ b/build/pkgs/jupyter_core/distros/opensuse.txt @@ -1 +1 @@ -python3-jupyter-core +python3${PYTHON_MINOR}-jupyter-core diff --git a/build/pkgs/jupyter_core/spkg-configure.m4 b/build/pkgs/jupyter_core/spkg-configure.m4 new file mode 100644 index 00000000000..67df9c38b5b --- /dev/null +++ b/build/pkgs/jupyter_core/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([jupyter_core], [ + SAGE_PYTHON_PACKAGE_CHECK([jupyter_core]) +]) diff --git a/build/pkgs/jupyter_jsmol/SPKG.rst b/build/pkgs/jupyter_jsmol/SPKG.rst index e318a86c7b1..64458e86b2d 100644 --- a/build/pkgs/jupyter_jsmol/SPKG.rst +++ b/build/pkgs/jupyter_jsmol/SPKG.rst @@ -9,7 +9,7 @@ JSmol viewer widget for Jupyter License ------- -BSD +MIT Upstream Contact ---------------- diff --git a/build/pkgs/jupyter_jsmol/checksums.ini b/build/pkgs/jupyter_jsmol/checksums.ini index 0ac16d6e78c..9ac2c41a8e4 100644 --- a/build/pkgs/jupyter_jsmol/checksums.ini +++ b/build/pkgs/jupyter_jsmol/checksums.ini @@ -1,5 +1,5 @@ -tarball=jupyter_jsmol-VERSION.tar.gz -sha1=6ba59de9d1df15b2a09a57f6bdf10f48f13af9ac -md5=90e9490414e7fbecc6013b4b051b06d7 -cksum=917919116 -upstream_url=https://pypi.io/packages/source/j/jupyter-jsmol/jupyter_jsmol-VERSION.tar.gz +tarball=jupyter_jsmol-VERSION-py2.py3-none-any.whl +sha1=b00f1ca76aaa906c7c0a43e36baf608183f3d552 +md5=dd786877513296a36a08518ad64ace47 +cksum=2135042898 +upstream_url=https://pypi.io/packages/py2.py3/j/jupyter_jsmol/jupyter_jsmol-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jupyter_jsmol/dependencies b/build/pkgs/jupyter_jsmol/dependencies index a6d87526311..2c7683a6111 100644 --- a/build/pkgs/jupyter_jsmol/dependencies +++ b/build/pkgs/jupyter_jsmol/dependencies @@ -1,4 +1,4 @@ -ipywidgets jupyter_packaging $(PYTHON) | $(PYTHON_TOOLCHAIN) +ipywidgets | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyter_jsmol/install-requires.txt b/build/pkgs/jupyter_jsmol/install-requires.txt index 2df501ec9a8..9465bfb8e0c 100644 --- a/build/pkgs/jupyter_jsmol/install-requires.txt +++ b/build/pkgs/jupyter_jsmol/install-requires.txt @@ -1 +1 @@ -jupyter-jsmol >=2022.1.0 +jupyter-jsmol diff --git a/build/pkgs/jupyter_jsmol/spkg-install.in b/build/pkgs/jupyter_jsmol/spkg-install.in deleted file mode 100644 index 72d65dde8d5..00000000000 --- a/build/pkgs/jupyter_jsmol/spkg-install.in +++ /dev/null @@ -1,3 +0,0 @@ -cd src -# Use --no-build-isolation because we have a different version of jupyter_packaging -eval sdh_pip_install --no-build-isolation --config-settings "--global-option=--skip-npm" . diff --git a/build/pkgs/jupyter_packaging/dependencies b/build/pkgs/jupyter_packaging/dependencies index 838afe13edf..11e420a0a7b 100644 --- a/build/pkgs/jupyter_packaging/dependencies +++ b/build/pkgs/jupyter_packaging/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) packaging deprecation tomlkit | $(PYTHON_TOOLCHAIN) hatchling + packaging deprecation tomlkit | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyter_sphinx/dependencies b/build/pkgs/jupyter_sphinx/dependencies index 785929f6ea8..37476f7a572 100644 --- a/build/pkgs/jupyter_sphinx/dependencies +++ b/build/pkgs/jupyter_sphinx/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) sphinx ipywidgets ipython nbconvert nbformat | $(PYTHON_TOOLCHAIN) + sphinx ipywidgets ipython nbconvert nbformat | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyterlab/dependencies b/build/pkgs/jupyterlab/dependencies index 98ad2e94050..059006650e1 100644 --- a/build/pkgs/jupyterlab/dependencies +++ b/build/pkgs/jupyterlab/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) vcversioner jupyter_core jupyter_client jinja2 tornado ipython packaging terminado traitlets nbconvert send2trash nbformat prometheus_client ipython_genutils argon2_cffi pyzmq idna requests jsonschema babel notebook | $(PYTHON_TOOLCHAIN) + vcversioner jupyter_core jupyter_client jinja2 tornado ipython packaging terminado traitlets nbconvert send2trash nbformat prometheus_client ipython_genutils argon2_cffi pyzmq idna requests jsonschema babel notebook | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyterlab_pygments/dependencies b/build/pkgs/jupyterlab_pygments/dependencies index a59532cdda1..fd3f15b7aa3 100644 --- a/build/pkgs/jupyterlab_pygments/dependencies +++ b/build/pkgs/jupyterlab_pygments/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pygments | $(PYTHON_TOOLCHAIN) + pygments | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyterlab_pygments/distros/gentoo.txt b/build/pkgs/jupyterlab_pygments/distros/gentoo.txt new file mode 100644 index 00000000000..c57b4f13403 --- /dev/null +++ b/build/pkgs/jupyterlab_pygments/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/jupyterlab_pygments diff --git a/build/pkgs/jupyterlab_pygments/spkg-configure.m4 b/build/pkgs/jupyterlab_pygments/spkg-configure.m4 new file mode 100644 index 00000000000..e46e21f461e --- /dev/null +++ b/build/pkgs/jupyterlab_pygments/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([jupyterlab_pygments], [ + SAGE_PYTHON_PACKAGE_CHECK([jupyterlab_pygments]) +]) diff --git a/build/pkgs/jupyterlab_widgets/dependencies b/build/pkgs/jupyterlab_widgets/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/jupyterlab_widgets/dependencies +++ b/build/pkgs/jupyterlab_widgets/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyterlab_widgets/distros/arch.txt b/build/pkgs/jupyterlab_widgets/distros/arch.txt new file mode 100644 index 00000000000..0800dc09838 --- /dev/null +++ b/build/pkgs/jupyterlab_widgets/distros/arch.txt @@ -0,0 +1 @@ +jupyterlab-widgets diff --git a/build/pkgs/jupyterlab_widgets/distros/freebsd.txt b/build/pkgs/jupyterlab_widgets/distros/freebsd.txt new file mode 100644 index 00000000000..6fc98fe86a0 --- /dev/null +++ b/build/pkgs/jupyterlab_widgets/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-jupyterlab-widgets diff --git a/build/pkgs/jupyterlab_widgets/distros/opensuse.txt b/build/pkgs/jupyterlab_widgets/distros/opensuse.txt new file mode 100644 index 00000000000..04706eee600 --- /dev/null +++ b/build/pkgs/jupyterlab_widgets/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-jupyterlab-widgets diff --git a/build/pkgs/kiwisolver/dependencies b/build/pkgs/kiwisolver/dependencies index 5df13094620..1ba038a9b7a 100644 --- a/build/pkgs/kiwisolver/dependencies +++ b/build/pkgs/kiwisolver/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cppy | $(PYTHON_TOOLCHAIN) + cppy | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/kiwisolver/distros/gentoo.txt b/build/pkgs/kiwisolver/distros/gentoo.txt new file mode 100644 index 00000000000..7b30c9540ec --- /dev/null +++ b/build/pkgs/kiwisolver/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/kiwisolver diff --git a/build/pkgs/kiwisolver/spkg-configure.m4 b/build/pkgs/kiwisolver/spkg-configure.m4 new file mode 100644 index 00000000000..4e7ac97b57d --- /dev/null +++ b/build/pkgs/kiwisolver/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([kiwisolver], [SAGE_PYTHON_PACKAGE_CHECK([kiwisolver])]) diff --git a/build/pkgs/lrcalc_python/dependencies b/build/pkgs/lrcalc_python/dependencies index 27c96045586..d7e0cec0534 100644 --- a/build/pkgs/lrcalc_python/dependencies +++ b/build/pkgs/lrcalc_python/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) lrcalc | $(PYTHON_TOOLCHAIN) cython + lrcalc | $(PYTHON_TOOLCHAIN) cython $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/markupsafe/dependencies b/build/pkgs/markupsafe/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/markupsafe/dependencies +++ b/build/pkgs/markupsafe/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/markupsafe/distros/gentoo.txt b/build/pkgs/markupsafe/distros/gentoo.txt new file mode 100644 index 00000000000..9654e3531b6 --- /dev/null +++ b/build/pkgs/markupsafe/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/markupsafe diff --git a/build/pkgs/markupsafe/distros/opensuse.txt b/build/pkgs/markupsafe/distros/opensuse.txt index 483c7ee1e18..8c103c6b5e5 100644 --- a/build/pkgs/markupsafe/distros/opensuse.txt +++ b/build/pkgs/markupsafe/distros/opensuse.txt @@ -1 +1 @@ -python3-MarkupSafe +python3${PYTHON_MINOR}-MarkupSafe diff --git a/build/pkgs/markupsafe/install-requires.txt b/build/pkgs/markupsafe/install-requires.txt index 331f488e6a0..7d44bce10e1 100644 --- a/build/pkgs/markupsafe/install-requires.txt +++ b/build/pkgs/markupsafe/install-requires.txt @@ -1 +1 @@ -markupsafe >=1.1.0 +markupsafe >=2.0 diff --git a/build/pkgs/markupsafe/spkg-configure.m4 b/build/pkgs/markupsafe/spkg-configure.m4 new file mode 100644 index 00000000000..79eb8dba6f1 --- /dev/null +++ b/build/pkgs/markupsafe/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([markupsafe], [SAGE_PYTHON_PACKAGE_CHECK([markupsafe])]) diff --git a/build/pkgs/mathics/dependencies b/build/pkgs/mathics/dependencies index ac723a5ac26..11d5626d8c7 100644 --- a/build/pkgs/mathics/dependencies +++ b/build/pkgs/mathics/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) pint palettable mathics_scanner + | $(PYTHON_TOOLCHAIN) pint palettable mathics_scanner $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/mathics_scanner/dependencies b/build/pkgs/mathics_scanner/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/mathics_scanner/dependencies +++ b/build/pkgs/mathics_scanner/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/matplotlib/dependencies b/build/pkgs/matplotlib/dependencies index cfcf3edda7e..a2592fe7c6d 100644 --- a/build/pkgs/matplotlib/dependencies +++ b/build/pkgs/matplotlib/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) numpy freetype pillow dateutil pyparsing tornado six cycler qhull fonttools contourpy | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm_git_archive + numpy freetype pillow dateutil pyparsing tornado six cycler qhull fonttools contourpy | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm_git_archive $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/matplotlib/distros/arch.txt b/build/pkgs/matplotlib/distros/arch.txt new file mode 100644 index 00000000000..f6d856e585c --- /dev/null +++ b/build/pkgs/matplotlib/distros/arch.txt @@ -0,0 +1 @@ +python-matplotlib diff --git a/build/pkgs/matplotlib/distros/debian.txt b/build/pkgs/matplotlib/distros/debian.txt new file mode 100644 index 00000000000..13743297213 --- /dev/null +++ b/build/pkgs/matplotlib/distros/debian.txt @@ -0,0 +1 @@ +python3-matplotlib diff --git a/build/pkgs/matplotlib/distros/fedora.txt b/build/pkgs/matplotlib/distros/fedora.txt new file mode 100644 index 00000000000..f6d856e585c --- /dev/null +++ b/build/pkgs/matplotlib/distros/fedora.txt @@ -0,0 +1 @@ +python-matplotlib diff --git a/build/pkgs/matplotlib/distros/gentoo.txt b/build/pkgs/matplotlib/distros/gentoo.txt new file mode 100644 index 00000000000..bcfefb5fcc4 --- /dev/null +++ b/build/pkgs/matplotlib/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/matplotlib diff --git a/build/pkgs/matplotlib/distros/opensuse.txt b/build/pkgs/matplotlib/distros/opensuse.txt index 13743297213..40f1130ec6f 100644 --- a/build/pkgs/matplotlib/distros/opensuse.txt +++ b/build/pkgs/matplotlib/distros/opensuse.txt @@ -1 +1 @@ -python3-matplotlib +python3${PYTHON_MINOR}-matplotlib diff --git a/build/pkgs/matplotlib/spkg-configure.m4 b/build/pkgs/matplotlib/spkg-configure.m4 new file mode 100644 index 00000000000..39c2d2901d0 --- /dev/null +++ b/build/pkgs/matplotlib/spkg-configure.m4 @@ -0,0 +1,5 @@ +SAGE_SPKG_CONFIGURE([matplotlib], [ + SAGE_SPKG_DEPCHECK([bzip2 freetype libpng qhull], [ + SAGE_PYTHON_PACKAGE_CHECK([matplotlib]) + ]) +]) diff --git a/build/pkgs/matplotlib_inline/dependencies b/build/pkgs/matplotlib_inline/dependencies index 1da34eeae60..a1a8daa948c 100644 --- a/build/pkgs/matplotlib_inline/dependencies +++ b/build/pkgs/matplotlib_inline/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) traitlets | $(PYTHON_TOOLCHAIN) + traitlets | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/matplotlib_inline/distros/gentoo.txt b/build/pkgs/matplotlib_inline/distros/gentoo.txt new file mode 100644 index 00000000000..6a5859ca074 --- /dev/null +++ b/build/pkgs/matplotlib_inline/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/matplotlib-inline diff --git a/build/pkgs/matplotlib_inline/spkg-configure.m4 b/build/pkgs/matplotlib_inline/spkg-configure.m4 new file mode 100644 index 00000000000..e59658ff159 --- /dev/null +++ b/build/pkgs/matplotlib_inline/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([matplotlib_inline], [ + SAGE_PYTHON_PACKAGE_CHECK([matplotlib_inline]) +]) diff --git a/build/pkgs/memory_allocator/dependencies b/build/pkgs/memory_allocator/dependencies index 296a2bebad3..1db13c07e43 100644 --- a/build/pkgs/memory_allocator/dependencies +++ b/build/pkgs/memory_allocator/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython | $(PYTHON_TOOLCHAIN) + cython | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/meson/dependencies b/build/pkgs/meson/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/meson/dependencies +++ b/build/pkgs/meson/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/meson_python/dependencies b/build/pkgs/meson_python/dependencies index 160adbf36c9..01b5cb597b0 100644 --- a/build/pkgs/meson_python/dependencies +++ b/build/pkgs/meson_python/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) meson pyproject_metadata tomli ninja_build patchelf | $(PYTHON_TOOLCHAIN) + meson pyproject_metadata tomli ninja_build patchelf | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/mistune/dependencies b/build/pkgs/mistune/dependencies index 296a2bebad3..1db13c07e43 100644 --- a/build/pkgs/mistune/dependencies +++ b/build/pkgs/mistune/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython | $(PYTHON_TOOLCHAIN) + cython | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/mistune/distros/gentoo.txt b/build/pkgs/mistune/distros/gentoo.txt new file mode 100644 index 00000000000..56f0a4ebced --- /dev/null +++ b/build/pkgs/mistune/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/mistune diff --git a/build/pkgs/mistune/spkg-configure.m4 b/build/pkgs/mistune/spkg-configure.m4 new file mode 100644 index 00000000000..972f33d086b --- /dev/null +++ b/build/pkgs/mistune/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([mistune], [SAGE_PYTHON_PACKAGE_CHECK([mistune])]) diff --git a/build/pkgs/mpmath/dependencies b/build/pkgs/mpmath/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/mpmath/dependencies +++ b/build/pkgs/mpmath/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/mpmath/distros/arch.txt b/build/pkgs/mpmath/distros/arch.txt new file mode 100644 index 00000000000..a7dc8d568f3 --- /dev/null +++ b/build/pkgs/mpmath/distros/arch.txt @@ -0,0 +1 @@ +python-mpmath diff --git a/build/pkgs/mpmath/distros/debian.txt b/build/pkgs/mpmath/distros/debian.txt new file mode 100644 index 00000000000..fbc82a97e07 --- /dev/null +++ b/build/pkgs/mpmath/distros/debian.txt @@ -0,0 +1 @@ +python3-mpmath diff --git a/build/pkgs/mpmath/distros/fedora.txt b/build/pkgs/mpmath/distros/fedora.txt new file mode 100644 index 00000000000..a7dc8d568f3 --- /dev/null +++ b/build/pkgs/mpmath/distros/fedora.txt @@ -0,0 +1 @@ +python-mpmath diff --git a/build/pkgs/mpmath/distros/gentoo.txt b/build/pkgs/mpmath/distros/gentoo.txt new file mode 100644 index 00000000000..946c62d9e1a --- /dev/null +++ b/build/pkgs/mpmath/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/mpmath diff --git a/build/pkgs/mpmath/distros/opensuse.txt b/build/pkgs/mpmath/distros/opensuse.txt new file mode 100644 index 00000000000..8b65d97862d --- /dev/null +++ b/build/pkgs/mpmath/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-mpmath diff --git a/build/pkgs/mpmath/spkg-configure.m4 b/build/pkgs/mpmath/spkg-configure.m4 new file mode 100644 index 00000000000..f43c8388264 --- /dev/null +++ b/build/pkgs/mpmath/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([mpmath], [SAGE_PYTHON_PACKAGE_CHECK([mpmath])]) diff --git a/build/pkgs/nbclient/dependencies b/build/pkgs/nbclient/dependencies index e21070fd3af..acec3fadace 100644 --- a/build/pkgs/nbclient/dependencies +++ b/build/pkgs/nbclient/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) jupyter_client nbformat | $(PYTHON_TOOLCHAIN) + jupyter_client nbformat | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/nbclient/distros/gentoo.txt b/build/pkgs/nbclient/distros/gentoo.txt new file mode 100644 index 00000000000..06ff18d206a --- /dev/null +++ b/build/pkgs/nbclient/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/nbclient diff --git a/build/pkgs/nbclient/spkg-configure.m4 b/build/pkgs/nbclient/spkg-configure.m4 new file mode 100644 index 00000000000..14178b793d2 --- /dev/null +++ b/build/pkgs/nbclient/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([nbclient], [SAGE_PYTHON_PACKAGE_CHECK([nbclient])]) diff --git a/build/pkgs/nbconvert/dependencies b/build/pkgs/nbconvert/dependencies index b423493e603..09dfbf42cb8 100644 --- a/build/pkgs/nbconvert/dependencies +++ b/build/pkgs/nbconvert/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) mistune jinja2 pygments traitlets jupyter_core nbformat entrypoints bleach pandocfilters defusedxml jupyter_client jupyterlab_pygments nbclient beautifulsoup4 markupsafe | $(PYTHON_TOOLCHAIN) + mistune jinja2 pygments traitlets jupyter_core nbformat entrypoints bleach pandocfilters defusedxml jupyter_client jupyterlab_pygments nbclient beautifulsoup4 markupsafe | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/nbconvert/distros/gentoo.txt b/build/pkgs/nbconvert/distros/gentoo.txt new file mode 100644 index 00000000000..6c45a107368 --- /dev/null +++ b/build/pkgs/nbconvert/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/nbconvert diff --git a/build/pkgs/nbconvert/spkg-configure.m4 b/build/pkgs/nbconvert/spkg-configure.m4 new file mode 100644 index 00000000000..9b5dee3b8b5 --- /dev/null +++ b/build/pkgs/nbconvert/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([nbconvert], [SAGE_PYTHON_PACKAGE_CHECK([nbconvert])]) diff --git a/build/pkgs/nbformat/dependencies b/build/pkgs/nbformat/dependencies index 6c8921f1382..a6f9cc5f425 100644 --- a/build/pkgs/nbformat/dependencies +++ b/build/pkgs/nbformat/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) jsonschema fastjsonschema jupyter_core traitlets | $(PYTHON_TOOLCHAIN) hatchling hatch_nodejs_version + jsonschema fastjsonschema jupyter_core traitlets | $(PYTHON_TOOLCHAIN) hatchling hatch_nodejs_version $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/nbformat/distros/gentoo.txt b/build/pkgs/nbformat/distros/gentoo.txt new file mode 100644 index 00000000000..006b1f2fc6d --- /dev/null +++ b/build/pkgs/nbformat/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/nbformat diff --git a/build/pkgs/nbformat/spkg-configure.m4 b/build/pkgs/nbformat/spkg-configure.m4 new file mode 100644 index 00000000000..5a7f8c4ccec --- /dev/null +++ b/build/pkgs/nbformat/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([nbformat], [SAGE_PYTHON_PACKAGE_CHECK([nbformat])]) diff --git a/build/pkgs/nest_asyncio/dependencies b/build/pkgs/nest_asyncio/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/nest_asyncio/dependencies +++ b/build/pkgs/nest_asyncio/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/nest_asyncio/distros/gentoo.txt b/build/pkgs/nest_asyncio/distros/gentoo.txt new file mode 100644 index 00000000000..ab742d2b0bd --- /dev/null +++ b/build/pkgs/nest_asyncio/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/nest_asyncio diff --git a/build/pkgs/nest_asyncio/spkg-configure.m4 b/build/pkgs/nest_asyncio/spkg-configure.m4 new file mode 100644 index 00000000000..4d815276dfb --- /dev/null +++ b/build/pkgs/nest_asyncio/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([nest_asyncio], [SAGE_PYTHON_PACKAGE_CHECK([nest_asyncio])]) diff --git a/build/pkgs/networkx/dependencies b/build/pkgs/networkx/dependencies index 8eb6920e25d..fdba548c01a 100644 --- a/build/pkgs/networkx/dependencies +++ b/build/pkgs/networkx/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) decorator | $(PYTHON_TOOLCHAIN) scipy + decorator | $(PYTHON_TOOLCHAIN) scipy $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/networkx/distros/arch.txt b/build/pkgs/networkx/distros/arch.txt new file mode 100644 index 00000000000..293f943529a --- /dev/null +++ b/build/pkgs/networkx/distros/arch.txt @@ -0,0 +1 @@ +python-networkx diff --git a/build/pkgs/networkx/distros/debian.txt b/build/pkgs/networkx/distros/debian.txt new file mode 100644 index 00000000000..67790667af2 --- /dev/null +++ b/build/pkgs/networkx/distros/debian.txt @@ -0,0 +1 @@ +python3-networkx diff --git a/build/pkgs/networkx/distros/fedora.txt b/build/pkgs/networkx/distros/fedora.txt new file mode 100644 index 00000000000..293f943529a --- /dev/null +++ b/build/pkgs/networkx/distros/fedora.txt @@ -0,0 +1 @@ +python-networkx diff --git a/build/pkgs/networkx/distros/gentoo.txt b/build/pkgs/networkx/distros/gentoo.txt new file mode 100644 index 00000000000..dd97742cff8 --- /dev/null +++ b/build/pkgs/networkx/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/networkx diff --git a/build/pkgs/networkx/distros/opensuse.txt b/build/pkgs/networkx/distros/opensuse.txt index 67790667af2..7c421f08d48 100644 --- a/build/pkgs/networkx/distros/opensuse.txt +++ b/build/pkgs/networkx/distros/opensuse.txt @@ -1 +1 @@ -python3-networkx +python3${PYTHON_MINOR}-networkx diff --git a/build/pkgs/networkx/spkg-configure.m4 b/build/pkgs/networkx/spkg-configure.m4 new file mode 100644 index 00000000000..926671e166e --- /dev/null +++ b/build/pkgs/networkx/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([networkx], [SAGE_PYTHON_PACKAGE_CHECK([networkx])]) diff --git a/build/pkgs/nibabel/distros/opensuse.txt b/build/pkgs/nibabel/distros/opensuse.txt index 19df029d93f..1a7f1fd31f7 100644 --- a/build/pkgs/nibabel/distros/opensuse.txt +++ b/build/pkgs/nibabel/distros/opensuse.txt @@ -1 +1 @@ -python3-nibabel +python3${PYTHON_MINOR}-nibabel diff --git a/build/pkgs/ninja_build/dependencies b/build/pkgs/ninja_build/dependencies index 6b134137610..3518086ab84 100644 --- a/build/pkgs/ninja_build/dependencies +++ b/build/pkgs/ninja_build/dependencies @@ -1,4 +1,4 @@ -| $(PYTHON) +| $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/nodeenv/dependencies b/build/pkgs/nodeenv/dependencies index 16df46f57ee..04eff0c842c 100644 --- a/build/pkgs/nodeenv/dependencies +++ b/build/pkgs/nodeenv/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) certifi + | $(PYTHON_TOOLCHAIN) certifi $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/notebook/dependencies b/build/pkgs/notebook/dependencies index 9f5cb330ae2..9e6cbf4b36d 100644 --- a/build/pkgs/notebook/dependencies +++ b/build/pkgs/notebook/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) ipython jupyter_client ipykernel nbconvert nbformat jinja2 tornado terminado send2trash prometheus_client argon2_cffi + | $(PYTHON_TOOLCHAIN) ipython jupyter_client ipykernel nbconvert nbformat jinja2 tornado terminado send2trash prometheus_client argon2_cffi $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/notebook/distros/gentoo.txt b/build/pkgs/notebook/distros/gentoo.txt new file mode 100644 index 00000000000..6475d72541e --- /dev/null +++ b/build/pkgs/notebook/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/notebook diff --git a/build/pkgs/notebook/spkg-configure.m4 b/build/pkgs/notebook/spkg-configure.m4 new file mode 100644 index 00000000000..a17ba95eac6 --- /dev/null +++ b/build/pkgs/notebook/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([notebook], [SAGE_PYTHON_PACKAGE_CHECK([notebook])]) diff --git a/build/pkgs/notedown/dependencies b/build/pkgs/notedown/dependencies index ea77eefc7f4..3dcb5b1900f 100644 --- a/build/pkgs/notedown/dependencies +++ b/build/pkgs/notedown/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) $(PYTHON_TOOLCHAIN) | pip nbformat nbconvert six pandoc_attributes + $(PYTHON_TOOLCHAIN) | pip nbformat nbconvert six pandoc_attributes $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/numpy/dependencies b/build/pkgs/numpy/dependencies index d3c0f0055e4..63faafe335a 100644 --- a/build/pkgs/numpy/dependencies +++ b/build/pkgs/numpy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) $(BLAS) gfortran | $(PYTHON_TOOLCHAIN) pkgconfig cython + $(BLAS) gfortran | $(PYTHON_TOOLCHAIN) pkgconfig cython $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/numpy/distros/arch.txt b/build/pkgs/numpy/distros/arch.txt new file mode 100644 index 00000000000..c8722b9f663 --- /dev/null +++ b/build/pkgs/numpy/distros/arch.txt @@ -0,0 +1 @@ +python-numpy diff --git a/build/pkgs/numpy/distros/debian.txt b/build/pkgs/numpy/distros/debian.txt new file mode 100644 index 00000000000..79d5c5a1429 --- /dev/null +++ b/build/pkgs/numpy/distros/debian.txt @@ -0,0 +1 @@ +python3-numpy diff --git a/build/pkgs/numpy/distros/fedora.txt b/build/pkgs/numpy/distros/fedora.txt new file mode 100644 index 00000000000..c8722b9f663 --- /dev/null +++ b/build/pkgs/numpy/distros/fedora.txt @@ -0,0 +1 @@ +python-numpy diff --git a/build/pkgs/numpy/distros/gentoo.txt b/build/pkgs/numpy/distros/gentoo.txt new file mode 100644 index 00000000000..d2179d43851 --- /dev/null +++ b/build/pkgs/numpy/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/numpy diff --git a/build/pkgs/numpy/distros/opensuse.txt b/build/pkgs/numpy/distros/opensuse.txt new file mode 100644 index 00000000000..2e278515236 --- /dev/null +++ b/build/pkgs/numpy/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-numpy diff --git a/build/pkgs/numpy/spkg-configure.m4 b/build/pkgs/numpy/spkg-configure.m4 new file mode 100644 index 00000000000..16f9a90fad2 --- /dev/null +++ b/build/pkgs/numpy/spkg-configure.m4 @@ -0,0 +1,5 @@ +SAGE_SPKG_CONFIGURE([numpy], [ + SAGE_SPKG_DEPCHECK([openblas], [ + SAGE_PYTHON_PACKAGE_CHECK([numpy]) + ]) +]) diff --git a/build/pkgs/ore_algebra/dependencies b/build/pkgs/ore_algebra/dependencies index 05ba0d8954b..126e8ceee06 100644 --- a/build/pkgs/ore_algebra/dependencies +++ b/build/pkgs/ore_algebra/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) + | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/osqp_python/dependencies b/build/pkgs/osqp_python/dependencies index 4f344bba626..6cc50626d1d 100644 --- a/build/pkgs/osqp_python/dependencies +++ b/build/pkgs/osqp_python/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) qdldl_python numpy scipy | $(PYTHON_TOOLCHAIN) cmake + qdldl_python numpy scipy | $(PYTHON_TOOLCHAIN) cmake $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/p_group_cohomology/dependencies b/build/pkgs/p_group_cohomology/dependencies index a9d113183c5..57ea7e0dd94 100644 --- a/build/pkgs/p_group_cohomology/dependencies +++ b/build/pkgs/p_group_cohomology/dependencies @@ -1 +1 @@ -$(PYTHON) cython cysignals singular meataxe modular_resolution $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/structure/element.pxd $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/matrix/matrix0.pxd $(SAGE_SRC)/sage/libs/meataxe.pxd $(SAGE_SRC)/sage/rings/morphism.pxd | $(PYTHON_TOOLCHAIN) matplotlib gap xz $(SAGERUNTIME) ipywidgets + cython cysignals singular meataxe modular_resolution $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/structure/element.pxd $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/matrix/matrix0.pxd $(SAGE_SRC)/sage/libs/meataxe.pxd $(SAGE_SRC)/sage/rings/morphism.pxd | $(PYTHON_TOOLCHAIN) matplotlib gap xz $(SAGERUNTIME) ipywidgets $(PYTHON) diff --git a/build/pkgs/packaging/dependencies b/build/pkgs/packaging/dependencies index 2323f9df04a..17220ffcc37 100644 --- a/build/pkgs/packaging/dependencies +++ b/build/pkgs/packaging/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | setuptools pip wheel pyparsing setuptools_wheel + | setuptools pip wheel pyparsing setuptools_wheel $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/packaging/distros/arch.txt b/build/pkgs/packaging/distros/arch.txt new file mode 100644 index 00000000000..02ad855da9a --- /dev/null +++ b/build/pkgs/packaging/distros/arch.txt @@ -0,0 +1 @@ +python-packaging diff --git a/build/pkgs/packaging/distros/debian.txt b/build/pkgs/packaging/distros/debian.txt new file mode 100644 index 00000000000..8f1c0ffc29f --- /dev/null +++ b/build/pkgs/packaging/distros/debian.txt @@ -0,0 +1 @@ +python3-packaging diff --git a/build/pkgs/packaging/distros/fedora.txt b/build/pkgs/packaging/distros/fedora.txt new file mode 100644 index 00000000000..02ad855da9a --- /dev/null +++ b/build/pkgs/packaging/distros/fedora.txt @@ -0,0 +1 @@ +python-packaging diff --git a/build/pkgs/packaging/distros/gentoo.txt b/build/pkgs/packaging/distros/gentoo.txt new file mode 100644 index 00000000000..e5309ed2b25 --- /dev/null +++ b/build/pkgs/packaging/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/packaging diff --git a/build/pkgs/packaging/distros/opensuse.txt b/build/pkgs/packaging/distros/opensuse.txt new file mode 100644 index 00000000000..bec5186f923 --- /dev/null +++ b/build/pkgs/packaging/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-packaging diff --git a/build/pkgs/packaging/install-requires.txt b/build/pkgs/packaging/install-requires.txt index cb98c369e84..637d00eff2f 100644 --- a/build/pkgs/packaging/install-requires.txt +++ b/build/pkgs/packaging/install-requires.txt @@ -1,2 +1,3 @@ -packaging >=18.0 +packaging >=21.0 # Trac #30975: packaging 20.5 is known to work but we have to silence "DeprecationWarning: Creating a LegacyVersion" +# Sphinx needs >= 21 diff --git a/build/pkgs/packaging/spkg-configure.m4 b/build/pkgs/packaging/spkg-configure.m4 new file mode 100644 index 00000000000..398f9e13cd3 --- /dev/null +++ b/build/pkgs/packaging/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([packaging], [SAGE_PYTHON_PACKAGE_CHECK([packaging])]) diff --git a/build/pkgs/palettable/dependencies b/build/pkgs/palettable/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/palettable/dependencies +++ b/build/pkgs/palettable/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pandoc_attributes/dependencies b/build/pkgs/pandoc_attributes/dependencies index 64f88253c78..cc9d4970706 100644 --- a/build/pkgs/pandoc_attributes/dependencies +++ b/build/pkgs/pandoc_attributes/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) $(PYTHON_TOOLCHAIN) | pip pandocfilters + $(PYTHON_TOOLCHAIN) | pip pandocfilters $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pandocfilters/dependencies b/build/pkgs/pandocfilters/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pandocfilters/dependencies +++ b/build/pkgs/pandocfilters/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pandocfilters/distros/arch.txt b/build/pkgs/pandocfilters/distros/arch.txt new file mode 100644 index 00000000000..e7a86d0373c --- /dev/null +++ b/build/pkgs/pandocfilters/distros/arch.txt @@ -0,0 +1 @@ +python-pandocfilters diff --git a/build/pkgs/pandocfilters/distros/debian.txt b/build/pkgs/pandocfilters/distros/debian.txt new file mode 100644 index 00000000000..d0d4c24e15e --- /dev/null +++ b/build/pkgs/pandocfilters/distros/debian.txt @@ -0,0 +1 @@ +python3-pandocfilters diff --git a/build/pkgs/pandocfilters/distros/fedora.txt b/build/pkgs/pandocfilters/distros/fedora.txt new file mode 100644 index 00000000000..e7a86d0373c --- /dev/null +++ b/build/pkgs/pandocfilters/distros/fedora.txt @@ -0,0 +1 @@ +python-pandocfilters diff --git a/build/pkgs/pandocfilters/distros/gentoo.txt b/build/pkgs/pandocfilters/distros/gentoo.txt new file mode 100644 index 00000000000..a726fda2817 --- /dev/null +++ b/build/pkgs/pandocfilters/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pandocfilters diff --git a/build/pkgs/pandocfilters/distros/opensuse.txt b/build/pkgs/pandocfilters/distros/opensuse.txt new file mode 100644 index 00000000000..843b3c1b32b --- /dev/null +++ b/build/pkgs/pandocfilters/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-pandocfilters diff --git a/build/pkgs/pandocfilters/spkg-configure.m4 b/build/pkgs/pandocfilters/spkg-configure.m4 new file mode 100644 index 00000000000..3e9537f818c --- /dev/null +++ b/build/pkgs/pandocfilters/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([pandocfilters], [ + SAGE_PYTHON_PACKAGE_CHECK([pandocfilters]) +]) diff --git a/build/pkgs/pari_jupyter/dependencies b/build/pkgs/pari_jupyter/dependencies index 44eaa153cc2..f7f0020c13b 100644 --- a/build/pkgs/pari_jupyter/dependencies +++ b/build/pkgs/pari_jupyter/dependencies @@ -1 +1 @@ -$(PYTHON) pari | $(PYTHON_TOOLCHAIN) cython notebook jupyter_core + pari | $(PYTHON_TOOLCHAIN) cython notebook jupyter_core $(PYTHON) diff --git a/build/pkgs/parso/dependencies b/build/pkgs/parso/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/parso/dependencies +++ b/build/pkgs/parso/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/parso/distros/gentoo.txt b/build/pkgs/parso/distros/gentoo.txt new file mode 100644 index 00000000000..f9ce4c7f2f2 --- /dev/null +++ b/build/pkgs/parso/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/parso diff --git a/build/pkgs/parso/spkg-configure.m4 b/build/pkgs/parso/spkg-configure.m4 new file mode 100644 index 00000000000..1ca6f1b909d --- /dev/null +++ b/build/pkgs/parso/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([parso], [SAGE_PYTHON_PACKAGE_CHECK([parso])]) diff --git a/build/pkgs/pathspec/dependencies b/build/pkgs/pathspec/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pathspec/dependencies +++ b/build/pkgs/pathspec/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pexpect/dependencies b/build/pkgs/pexpect/dependencies index 4a942502496..d3f8eced66f 100644 --- a/build/pkgs/pexpect/dependencies +++ b/build/pkgs/pexpect/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) ptyprocess | $(PYTHON_TOOLCHAIN) + ptyprocess | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pexpect/distros/arch.txt b/build/pkgs/pexpect/distros/arch.txt new file mode 100644 index 00000000000..74d08141569 --- /dev/null +++ b/build/pkgs/pexpect/distros/arch.txt @@ -0,0 +1 @@ +python-pexpect diff --git a/build/pkgs/pexpect/distros/fedora.txt b/build/pkgs/pexpect/distros/fedora.txt new file mode 100644 index 00000000000..74d08141569 --- /dev/null +++ b/build/pkgs/pexpect/distros/fedora.txt @@ -0,0 +1 @@ +python-pexpect diff --git a/build/pkgs/pexpect/distros/freebsd.txt b/build/pkgs/pexpect/distros/freebsd.txt new file mode 100644 index 00000000000..767fd38a2fa --- /dev/null +++ b/build/pkgs/pexpect/distros/freebsd.txt @@ -0,0 +1 @@ +misc/py-pexpect diff --git a/build/pkgs/pexpect/distros/gentoo.txt b/build/pkgs/pexpect/distros/gentoo.txt new file mode 100644 index 00000000000..30c4b60d014 --- /dev/null +++ b/build/pkgs/pexpect/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pexpect diff --git a/build/pkgs/pexpect/distros/opensuse.txt b/build/pkgs/pexpect/distros/opensuse.txt index 8d745ee4a07..f8cc97d1599 100644 --- a/build/pkgs/pexpect/distros/opensuse.txt +++ b/build/pkgs/pexpect/distros/opensuse.txt @@ -1 +1 @@ -python3-pexpect +python3${PYTHON_MINOR}-pexpect diff --git a/build/pkgs/pexpect/spkg-configure.m4 b/build/pkgs/pexpect/spkg-configure.m4 new file mode 100644 index 00000000000..6520856fbb5 --- /dev/null +++ b/build/pkgs/pexpect/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pexpect], [SAGE_PYTHON_PACKAGE_CHECK([pexpect])]) diff --git a/build/pkgs/phitigra/dependencies b/build/pkgs/phitigra/dependencies index 7aeb0c77c74..61dca76d6bc 100644 --- a/build/pkgs/phitigra/dependencies +++ b/build/pkgs/phitigra/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) ipywidgets pillow numpy | $(PYTHON_TOOLCHAIN) + ipywidgets pillow numpy | $(PYTHON_TOOLCHAIN) $(PYTHON) These dependencies include the install-requires of ipycanvas. ---------- diff --git a/build/pkgs/pickleshare/dependencies b/build/pkgs/pickleshare/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pickleshare/dependencies +++ b/build/pkgs/pickleshare/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pickleshare/distros/arch.txt b/build/pkgs/pickleshare/distros/arch.txt new file mode 100644 index 00000000000..6d991a27d41 --- /dev/null +++ b/build/pkgs/pickleshare/distros/arch.txt @@ -0,0 +1 @@ +python-pickleshare diff --git a/build/pkgs/pickleshare/distros/debian.txt b/build/pkgs/pickleshare/distros/debian.txt new file mode 100644 index 00000000000..a00907d167b --- /dev/null +++ b/build/pkgs/pickleshare/distros/debian.txt @@ -0,0 +1 @@ +python3-pickleshare diff --git a/build/pkgs/pickleshare/distros/fedora.txt b/build/pkgs/pickleshare/distros/fedora.txt new file mode 100644 index 00000000000..6d991a27d41 --- /dev/null +++ b/build/pkgs/pickleshare/distros/fedora.txt @@ -0,0 +1 @@ +python-pickleshare diff --git a/build/pkgs/pickleshare/distros/gentoo.txt b/build/pkgs/pickleshare/distros/gentoo.txt new file mode 100644 index 00000000000..14fad0fa428 --- /dev/null +++ b/build/pkgs/pickleshare/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pickleshare diff --git a/build/pkgs/pickleshare/distros/opensuse.txt b/build/pkgs/pickleshare/distros/opensuse.txt index a00907d167b..260701493fc 100644 --- a/build/pkgs/pickleshare/distros/opensuse.txt +++ b/build/pkgs/pickleshare/distros/opensuse.txt @@ -1 +1 @@ -python3-pickleshare +python3${PYTHON_MINOR}-pickleshare diff --git a/build/pkgs/pickleshare/spkg-configure.m4 b/build/pkgs/pickleshare/spkg-configure.m4 new file mode 100644 index 00000000000..80e9b7ccba9 --- /dev/null +++ b/build/pkgs/pickleshare/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pickleshare], [SAGE_PYTHON_PACKAGE_CHECK([pickleshare])]) diff --git a/build/pkgs/pillow/dependencies b/build/pkgs/pillow/dependencies index 2ece64e58e8..f2500281136 100644 --- a/build/pkgs/pillow/dependencies +++ b/build/pkgs/pillow/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) zlib freetype | $(PYTHON_TOOLCHAIN) pkgconf + zlib freetype | $(PYTHON_TOOLCHAIN) pkgconf $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pillow/distros/arch.txt b/build/pkgs/pillow/distros/arch.txt new file mode 100644 index 00000000000..86dbb1d13b8 --- /dev/null +++ b/build/pkgs/pillow/distros/arch.txt @@ -0,0 +1 @@ +python-pillow diff --git a/build/pkgs/pillow/distros/debian.txt b/build/pkgs/pillow/distros/debian.txt new file mode 100644 index 00000000000..3319fcd7e0f --- /dev/null +++ b/build/pkgs/pillow/distros/debian.txt @@ -0,0 +1 @@ +python3-pillow diff --git a/build/pkgs/pillow/distros/fedora.txt b/build/pkgs/pillow/distros/fedora.txt new file mode 100644 index 00000000000..86dbb1d13b8 --- /dev/null +++ b/build/pkgs/pillow/distros/fedora.txt @@ -0,0 +1 @@ +python-pillow diff --git a/build/pkgs/pillow/distros/gentoo.txt b/build/pkgs/pillow/distros/gentoo.txt new file mode 100644 index 00000000000..12436496ed4 --- /dev/null +++ b/build/pkgs/pillow/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pillow diff --git a/build/pkgs/pillow/distros/opensuse.txt b/build/pkgs/pillow/distros/opensuse.txt index 88283bea6d9..8261b108af6 100644 --- a/build/pkgs/pillow/distros/opensuse.txt +++ b/build/pkgs/pillow/distros/opensuse.txt @@ -1 +1 @@ -python3-Pillow +python3${PYTHON_MINOR}-Pillow diff --git a/build/pkgs/pillow/spkg-configure.m4 b/build/pkgs/pillow/spkg-configure.m4 new file mode 100644 index 00000000000..f2e68e230ac --- /dev/null +++ b/build/pkgs/pillow/spkg-configure.m4 @@ -0,0 +1,5 @@ +SAGE_SPKG_CONFIGURE([pillow], [ + SAGE_SPKG_DEPCHECK([bzip2 freetype libpng zlib], [ + SAGE_PYTHON_PACKAGE_CHECK([pillow]) + ]) +]) diff --git a/build/pkgs/pint/dependencies b/build/pkgs/pint/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pint/dependencies +++ b/build/pkgs/pint/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pip/dependencies b/build/pkgs/pip/dependencies index 618d627629a..dac3579f7e3 100644 --- a/build/pkgs/pip/dependencies +++ b/build/pkgs/pip/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) setuptools wheel + setuptools wheel | $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pip/distros/debian.txt b/build/pkgs/pip/distros/debian.txt new file mode 100644 index 00000000000..39bd9fc5097 --- /dev/null +++ b/build/pkgs/pip/distros/debian.txt @@ -0,0 +1 @@ +python3-pip diff --git a/build/pkgs/pip/distros/fedora.txt b/build/pkgs/pip/distros/fedora.txt new file mode 100644 index 00000000000..311c1b821ca --- /dev/null +++ b/build/pkgs/pip/distros/fedora.txt @@ -0,0 +1 @@ +python-pip diff --git a/build/pkgs/pip/distros/freebsd.txt b/build/pkgs/pip/distros/freebsd.txt new file mode 100644 index 00000000000..7b125c1bfa4 --- /dev/null +++ b/build/pkgs/pip/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-pip diff --git a/build/pkgs/pip/distros/gentoo.txt b/build/pkgs/pip/distros/gentoo.txt new file mode 100644 index 00000000000..793fb731829 --- /dev/null +++ b/build/pkgs/pip/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pip diff --git a/build/pkgs/pip/distros/opensuse.txt b/build/pkgs/pip/distros/opensuse.txt index 39bd9fc5097..eb4aa7ea9f1 100644 --- a/build/pkgs/pip/distros/opensuse.txt +++ b/build/pkgs/pip/distros/opensuse.txt @@ -1 +1 @@ -python3-pip +python3${PYTHON_MINOR}-pip diff --git a/build/pkgs/pip/install-requires.txt b/build/pkgs/pip/install-requires.txt index 7af2e246633..5e76a10f694 100644 --- a/build/pkgs/pip/install-requires.txt +++ b/build/pkgs/pip/install-requires.txt @@ -1,2 +1,3 @@ -pip >=21.3 +pip >=22.1 # for use of the "in-tree-build" feature, default since 21.3, by the Sage distribution +# for use of --config-settings, 22.1 diff --git a/build/pkgs/pip/spkg-configure.m4 b/build/pkgs/pip/spkg-configure.m4 new file mode 100644 index 00000000000..c7a55621f48 --- /dev/null +++ b/build/pkgs/pip/spkg-configure.m4 @@ -0,0 +1,12 @@ +SAGE_SPKG_CONFIGURE([pip], [ + dnl always run this macro because it changes the default value of + dnl the --with-system- option. + SAGE_PYTHON_PACKAGE_CHECK([pip]) + + dnl if we might not install the spkg, make sure that "pip" is in + dnl the user's PATH, too. + AS_IF([test "x$sage_spkg_install_pip" != "xyes"], [ + AC_CHECK_PROG(HAVE_PIP, pip, yes, no) + AS_IF([test "x$HAVE_PIP" = "xno"], [sage_spkg_install_pip=yes]) + ]) +]) diff --git a/build/pkgs/pkgconfig/dependencies b/build/pkgs/pkgconfig/dependencies index 6dfe046e55e..b52668ccb01 100644 --- a/build/pkgs/pkgconfig/dependencies +++ b/build/pkgs/pkgconfig/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) pkgconf poetry_core + | $(PYTHON_TOOLCHAIN) pkgconf poetry_core $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pkgconfig/distros/arch.txt b/build/pkgs/pkgconfig/distros/arch.txt new file mode 100644 index 00000000000..38a18b3565f --- /dev/null +++ b/build/pkgs/pkgconfig/distros/arch.txt @@ -0,0 +1 @@ +python-pkgconfig diff --git a/build/pkgs/pkgconfig/distros/debian.txt b/build/pkgs/pkgconfig/distros/debian.txt new file mode 100644 index 00000000000..38e5106dd74 --- /dev/null +++ b/build/pkgs/pkgconfig/distros/debian.txt @@ -0,0 +1 @@ +python3-pkgconfig diff --git a/build/pkgs/pkgconfig/distros/fedora.txt b/build/pkgs/pkgconfig/distros/fedora.txt new file mode 100644 index 00000000000..38a18b3565f --- /dev/null +++ b/build/pkgs/pkgconfig/distros/fedora.txt @@ -0,0 +1 @@ +python-pkgconfig diff --git a/build/pkgs/pkgconfig/distros/freebsd.txt b/build/pkgs/pkgconfig/distros/freebsd.txt new file mode 100644 index 00000000000..d26a4e96787 --- /dev/null +++ b/build/pkgs/pkgconfig/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-pkgconfig diff --git a/build/pkgs/pkgconfig/distros/gentoo.txt b/build/pkgs/pkgconfig/distros/gentoo.txt new file mode 100644 index 00000000000..32e86187155 --- /dev/null +++ b/build/pkgs/pkgconfig/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pkgconfig diff --git a/build/pkgs/pkgconfig/spkg-configure.m4 b/build/pkgs/pkgconfig/spkg-configure.m4 new file mode 100644 index 00000000000..67082934525 --- /dev/null +++ b/build/pkgs/pkgconfig/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pkgconfig], [SAGE_PYTHON_PACKAGE_CHECK([pkgconfig])]) diff --git a/build/pkgs/platformdirs/dependencies b/build/pkgs/platformdirs/dependencies index 5b4aec583a4..952ebfb66cd 100644 --- a/build/pkgs/platformdirs/dependencies +++ b/build/pkgs/platformdirs/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) setuptools_scm | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs + setuptools_scm | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pluggy/dependencies b/build/pkgs/pluggy/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pluggy/dependencies +++ b/build/pkgs/pluggy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pluggy/distros/arch.txt b/build/pkgs/pluggy/distros/arch.txt new file mode 100644 index 00000000000..c869e54c551 --- /dev/null +++ b/build/pkgs/pluggy/distros/arch.txt @@ -0,0 +1 @@ +python-pluggy diff --git a/build/pkgs/pluggy/distros/debian.txt b/build/pkgs/pluggy/distros/debian.txt new file mode 100644 index 00000000000..43a3acf0462 --- /dev/null +++ b/build/pkgs/pluggy/distros/debian.txt @@ -0,0 +1 @@ +python3-pluggy diff --git a/build/pkgs/pluggy/distros/fedora.txt b/build/pkgs/pluggy/distros/fedora.txt new file mode 100644 index 00000000000..c869e54c551 --- /dev/null +++ b/build/pkgs/pluggy/distros/fedora.txt @@ -0,0 +1 @@ +python-pluggy diff --git a/build/pkgs/pluggy/distros/gentoo.txt b/build/pkgs/pluggy/distros/gentoo.txt new file mode 100644 index 00000000000..7b338764374 --- /dev/null +++ b/build/pkgs/pluggy/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pluggy diff --git a/build/pkgs/pluggy/distros/opensuse.txt b/build/pkgs/pluggy/distros/opensuse.txt new file mode 100644 index 00000000000..42720b43944 --- /dev/null +++ b/build/pkgs/pluggy/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-pluggy diff --git a/build/pkgs/pluggy/spkg-configure.m4 b/build/pkgs/pluggy/spkg-configure.m4 new file mode 100644 index 00000000000..11b1fce4f94 --- /dev/null +++ b/build/pkgs/pluggy/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pluggy], [SAGE_PYTHON_PACKAGE_CHECK([pluggy])]) diff --git a/build/pkgs/ply/dependencies b/build/pkgs/ply/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/ply/dependencies +++ b/build/pkgs/ply/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ply/distros/gentoo.txt b/build/pkgs/ply/distros/gentoo.txt new file mode 100644 index 00000000000..c8b16309b09 --- /dev/null +++ b/build/pkgs/ply/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/ply diff --git a/build/pkgs/ply/spkg-configure.m4 b/build/pkgs/ply/spkg-configure.m4 new file mode 100644 index 00000000000..ffb0030d013 --- /dev/null +++ b/build/pkgs/ply/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([ply], [SAGE_PYTHON_PACKAGE_CHECK([ply])]) diff --git a/build/pkgs/poetry_core/dependencies b/build/pkgs/poetry_core/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/poetry_core/dependencies +++ b/build/pkgs/poetry_core/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pplpy/dependencies b/build/pkgs/pplpy/dependencies index 84d4fbab430..f61061ddefe 100644 --- a/build/pkgs/pplpy/dependencies +++ b/build/pkgs/pplpy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) $(MP_LIBRARY) gmpy2 cysignals mpfr mpc ppl | $(PYTHON_TOOLCHAIN) sphinx + $(MP_LIBRARY) gmpy2 cysignals mpfr mpc ppl | $(PYTHON_TOOLCHAIN) sphinx $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pplpy/distros/arch.txt b/build/pkgs/pplpy/distros/arch.txt new file mode 100644 index 00000000000..579bdb042f6 --- /dev/null +++ b/build/pkgs/pplpy/distros/arch.txt @@ -0,0 +1 @@ +python-pplpy diff --git a/build/pkgs/pplpy/distros/fedora.txt b/build/pkgs/pplpy/distros/fedora.txt new file mode 100644 index 00000000000..579bdb042f6 --- /dev/null +++ b/build/pkgs/pplpy/distros/fedora.txt @@ -0,0 +1 @@ +python-pplpy diff --git a/build/pkgs/pplpy/distros/freebsd.txt b/build/pkgs/pplpy/distros/freebsd.txt new file mode 100644 index 00000000000..2006f870646 --- /dev/null +++ b/build/pkgs/pplpy/distros/freebsd.txt @@ -0,0 +1 @@ +math/py-pplpy diff --git a/build/pkgs/pplpy/distros/void.txt b/build/pkgs/pplpy/distros/void.txt new file mode 100644 index 00000000000..f39eaff76ae --- /dev/null +++ b/build/pkgs/pplpy/distros/void.txt @@ -0,0 +1 @@ +python3-pplpy diff --git a/build/pkgs/primecountpy/dependencies b/build/pkgs/primecountpy/dependencies index c141a1d7c2f..ce1374b2a0e 100644 --- a/build/pkgs/primecountpy/dependencies +++ b/build/pkgs/primecountpy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) primecount cysignals | $(PYTHON_TOOLCHAIN) cython + primecount cysignals | $(PYTHON_TOOLCHAIN) cython $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/prometheus_client/dependencies b/build/pkgs/prometheus_client/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/prometheus_client/dependencies +++ b/build/pkgs/prometheus_client/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/prometheus_client/distros/gentoo.txt b/build/pkgs/prometheus_client/distros/gentoo.txt new file mode 100644 index 00000000000..aa2889c913e --- /dev/null +++ b/build/pkgs/prometheus_client/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/prometheus_client diff --git a/build/pkgs/prometheus_client/distros/opensuse.txt b/build/pkgs/prometheus_client/distros/opensuse.txt index 4d7723ec37e..c061661b6e6 100644 --- a/build/pkgs/prometheus_client/distros/opensuse.txt +++ b/build/pkgs/prometheus_client/distros/opensuse.txt @@ -1 +1 @@ -python3-prometheus_client +python3${PYTHON_MINOR}-prometheus_client diff --git a/build/pkgs/prometheus_client/spkg-configure.m4 b/build/pkgs/prometheus_client/spkg-configure.m4 new file mode 100644 index 00000000000..b4945889131 --- /dev/null +++ b/build/pkgs/prometheus_client/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([prometheus_client], [ + SAGE_PYTHON_PACKAGE_CHECK([prometheus_client]) +]) diff --git a/build/pkgs/prompt_toolkit/dependencies b/build/pkgs/prompt_toolkit/dependencies index 57465daf937..2bdb6af86bc 100644 --- a/build/pkgs/prompt_toolkit/dependencies +++ b/build/pkgs/prompt_toolkit/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) six wcwidth | $(PYTHON_TOOLCHAIN) + six wcwidth | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/prompt_toolkit/distros/arch.txt b/build/pkgs/prompt_toolkit/distros/arch.txt new file mode 100644 index 00000000000..89b0ac83a9b --- /dev/null +++ b/build/pkgs/prompt_toolkit/distros/arch.txt @@ -0,0 +1 @@ +python-importlib_resources diff --git a/build/pkgs/prompt_toolkit/distros/debian.txt b/build/pkgs/prompt_toolkit/distros/debian.txt new file mode 100644 index 00000000000..2b0146fc669 --- /dev/null +++ b/build/pkgs/prompt_toolkit/distros/debian.txt @@ -0,0 +1 @@ +importlib-resources diff --git a/build/pkgs/prompt_toolkit/distros/fedora.txt b/build/pkgs/prompt_toolkit/distros/fedora.txt new file mode 100644 index 00000000000..967f8570d4f --- /dev/null +++ b/build/pkgs/prompt_toolkit/distros/fedora.txt @@ -0,0 +1 @@ +python-prompt-toolkit diff --git a/build/pkgs/prompt_toolkit/distros/freebsd.txt b/build/pkgs/prompt_toolkit/distros/freebsd.txt new file mode 100644 index 00000000000..a2f0c05129b --- /dev/null +++ b/build/pkgs/prompt_toolkit/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-importlib-resources diff --git a/build/pkgs/prompt_toolkit/distros/gentoo.txt b/build/pkgs/prompt_toolkit/distros/gentoo.txt new file mode 100644 index 00000000000..6902484e74c --- /dev/null +++ b/build/pkgs/prompt_toolkit/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/prompt_toolkit diff --git a/build/pkgs/prompt_toolkit/distros/opensuse.txt b/build/pkgs/prompt_toolkit/distros/opensuse.txt index 424253f1340..3c48b809bc1 100644 --- a/build/pkgs/prompt_toolkit/distros/opensuse.txt +++ b/build/pkgs/prompt_toolkit/distros/opensuse.txt @@ -1 +1 @@ -python3-prompt_toolkit +python3${PYTHON_MINOR}-importlib_resources diff --git a/build/pkgs/prompt_toolkit/spkg-configure.m4 b/build/pkgs/prompt_toolkit/spkg-configure.m4 new file mode 100644 index 00000000000..fd8c1a67015 --- /dev/null +++ b/build/pkgs/prompt_toolkit/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([prompt_toolkit], [ + SAGE_PYTHON_PACKAGE_CHECK([prompt_toolkit]) +]) diff --git a/build/pkgs/ptyprocess/dependencies b/build/pkgs/ptyprocess/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/ptyprocess/dependencies +++ b/build/pkgs/ptyprocess/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/ptyprocess/distros/arch.txt b/build/pkgs/ptyprocess/distros/arch.txt new file mode 100644 index 00000000000..911a22468fc --- /dev/null +++ b/build/pkgs/ptyprocess/distros/arch.txt @@ -0,0 +1 @@ +python-ptyprocess diff --git a/build/pkgs/ptyprocess/distros/fedora.txt b/build/pkgs/ptyprocess/distros/fedora.txt new file mode 100644 index 00000000000..911a22468fc --- /dev/null +++ b/build/pkgs/ptyprocess/distros/fedora.txt @@ -0,0 +1 @@ +python-ptyprocess diff --git a/build/pkgs/ptyprocess/distros/freebsd.txt b/build/pkgs/ptyprocess/distros/freebsd.txt new file mode 100644 index 00000000000..bc587f2e5fc --- /dev/null +++ b/build/pkgs/ptyprocess/distros/freebsd.txt @@ -0,0 +1 @@ +sysutils/py-ptyprocess diff --git a/build/pkgs/ptyprocess/distros/gentoo.txt b/build/pkgs/ptyprocess/distros/gentoo.txt new file mode 100644 index 00000000000..571a851d976 --- /dev/null +++ b/build/pkgs/ptyprocess/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/ptyprocess diff --git a/build/pkgs/ptyprocess/distros/opensuse.txt b/build/pkgs/ptyprocess/distros/opensuse.txt index ad4f6db1ca7..846495a86e8 100644 --- a/build/pkgs/ptyprocess/distros/opensuse.txt +++ b/build/pkgs/ptyprocess/distros/opensuse.txt @@ -1 +1 @@ -python3-ptyprocess +python3${PYTHON_MINOR}-ptyprocess diff --git a/build/pkgs/ptyprocess/spkg-configure.m4 b/build/pkgs/ptyprocess/spkg-configure.m4 new file mode 100644 index 00000000000..bfacbaed935 --- /dev/null +++ b/build/pkgs/ptyprocess/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([ptyprocess], [SAGE_PYTHON_PACKAGE_CHECK([ptyprocess])]) diff --git a/build/pkgs/pure_eval/dependencies b/build/pkgs/pure_eval/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pure_eval/dependencies +++ b/build/pkgs/pure_eval/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/py/dependencies b/build/pkgs/py/dependencies index 14a312e5dee..995ddecb8f4 100644 --- a/build/pkgs/py/dependencies +++ b/build/pkgs/py/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) setuptools_scm + | $(PYTHON_TOOLCHAIN) setuptools_scm $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/py/distros/arch.txt b/build/pkgs/py/distros/arch.txt new file mode 100644 index 00000000000..b348d395fbd --- /dev/null +++ b/build/pkgs/py/distros/arch.txt @@ -0,0 +1 @@ +python-py diff --git a/build/pkgs/py/distros/debian.txt b/build/pkgs/py/distros/debian.txt new file mode 100644 index 00000000000..81fefe60903 --- /dev/null +++ b/build/pkgs/py/distros/debian.txt @@ -0,0 +1 @@ +python3-py diff --git a/build/pkgs/py/distros/fedora.txt b/build/pkgs/py/distros/fedora.txt new file mode 100644 index 00000000000..b348d395fbd --- /dev/null +++ b/build/pkgs/py/distros/fedora.txt @@ -0,0 +1 @@ +python-py diff --git a/build/pkgs/py/distros/opensuse.txt b/build/pkgs/py/distros/opensuse.txt new file mode 100644 index 00000000000..c03de61a449 --- /dev/null +++ b/build/pkgs/py/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-py diff --git a/build/pkgs/py/spkg-configure.m4 b/build/pkgs/py/spkg-configure.m4 new file mode 100644 index 00000000000..ded70343090 --- /dev/null +++ b/build/pkgs/py/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([py], [SAGE_PYTHON_PACKAGE_CHECK([py])]) diff --git a/build/pkgs/pybind11/dependencies b/build/pkgs/pybind11/dependencies index da2b0925acd..ca33204bd52 100644 --- a/build/pkgs/pybind11/dependencies +++ b/build/pkgs/pybind11/dependencies @@ -1 +1 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) diff --git a/build/pkgs/pybind11/distros/gentoo.txt b/build/pkgs/pybind11/distros/gentoo.txt new file mode 100644 index 00000000000..0c500b3c84d --- /dev/null +++ b/build/pkgs/pybind11/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pybind11 diff --git a/build/pkgs/pybind11/install-requires.txt b/build/pkgs/pybind11/install-requires.txt index 7f37917011f..6c44c4bd07e 100644 --- a/build/pkgs/pybind11/install-requires.txt +++ b/build/pkgs/pybind11/install-requires.txt @@ -1 +1 @@ -pybind11 >=2.5.0 +pybind11 >=2.6 diff --git a/build/pkgs/pybind11/spkg-configure.m4 b/build/pkgs/pybind11/spkg-configure.m4 new file mode 100644 index 00000000000..cce1cf5cff8 --- /dev/null +++ b/build/pkgs/pybind11/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pybind11], [SAGE_PYTHON_PACKAGE_CHECK([pybind11])]) diff --git a/build/pkgs/pybtex/distros/opensuse.txt b/build/pkgs/pybtex/distros/opensuse.txt index bdd39a48fde..e482a1bfea0 100644 --- a/build/pkgs/pybtex/distros/opensuse.txt +++ b/build/pkgs/pybtex/distros/opensuse.txt @@ -1 +1 @@ -python3-pybtex +python3${PYTHON_MINOR}-pybtex diff --git a/build/pkgs/pycosat/dependencies b/build/pkgs/pycosat/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pycosat/dependencies +++ b/build/pkgs/pycosat/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pycosat/distros/alpine.txt b/build/pkgs/pycosat/distros/alpine.txt new file mode 100644 index 00000000000..7eb034d6713 --- /dev/null +++ b/build/pkgs/pycosat/distros/alpine.txt @@ -0,0 +1 @@ +py3-pycosat diff --git a/build/pkgs/pycosat/distros/arch.txt b/build/pkgs/pycosat/distros/arch.txt new file mode 100644 index 00000000000..dab3122ef4c --- /dev/null +++ b/build/pkgs/pycosat/distros/arch.txt @@ -0,0 +1 @@ +python-pycosat diff --git a/build/pkgs/pycosat/distros/fedora.txt b/build/pkgs/pycosat/distros/fedora.txt new file mode 100644 index 00000000000..dab3122ef4c --- /dev/null +++ b/build/pkgs/pycosat/distros/fedora.txt @@ -0,0 +1 @@ +python-pycosat diff --git a/build/pkgs/pycosat/distros/freebsd.txt b/build/pkgs/pycosat/distros/freebsd.txt new file mode 100644 index 00000000000..35e4e7730cc --- /dev/null +++ b/build/pkgs/pycosat/distros/freebsd.txt @@ -0,0 +1 @@ +math/py-pycosat diff --git a/build/pkgs/pycparser/dependencies b/build/pkgs/pycparser/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pycparser/dependencies +++ b/build/pkgs/pycparser/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pycparser/distros/gentoo.txt b/build/pkgs/pycparser/distros/gentoo.txt new file mode 100644 index 00000000000..5e87307c4b9 --- /dev/null +++ b/build/pkgs/pycparser/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pycparser diff --git a/build/pkgs/pycparser/distros/opensuse.txt b/build/pkgs/pycparser/distros/opensuse.txt index 0ba4f8b19f5..503e7c176d1 100644 --- a/build/pkgs/pycparser/distros/opensuse.txt +++ b/build/pkgs/pycparser/distros/opensuse.txt @@ -1 +1 @@ -python3-pycparser +python3${PYTHON_MINOR}-pycparser diff --git a/build/pkgs/pycparser/spkg-configure.m4 b/build/pkgs/pycparser/spkg-configure.m4 new file mode 100644 index 00000000000..4b9b90079a9 --- /dev/null +++ b/build/pkgs/pycparser/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pycparser], [SAGE_PYTHON_PACKAGE_CHECK([pycparser])]) diff --git a/build/pkgs/pycryptosat/dependencies b/build/pkgs/pycryptosat/dependencies index b897ff72eae..c51735427aa 100644 --- a/build/pkgs/pycryptosat/dependencies +++ b/build/pkgs/pycryptosat/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) m4ri zlib libpng cryptominisat | cmake boost_cropped $(PYTHON_TOOLCHAIN) + m4ri zlib libpng cryptominisat | cmake boost_cropped $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pycygwin/dependencies b/build/pkgs/pycygwin/dependencies index 296a2bebad3..1db13c07e43 100644 --- a/build/pkgs/pycygwin/dependencies +++ b/build/pkgs/pycygwin/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython | $(PYTHON_TOOLCHAIN) + cython | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pygments/dependencies b/build/pkgs/pygments/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pygments/dependencies +++ b/build/pkgs/pygments/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pygments/distros/arch.txt b/build/pkgs/pygments/distros/arch.txt new file mode 100644 index 00000000000..f3e72a89c38 --- /dev/null +++ b/build/pkgs/pygments/distros/arch.txt @@ -0,0 +1 @@ +python-pygments diff --git a/build/pkgs/pygments/distros/debian.txt b/build/pkgs/pygments/distros/debian.txt new file mode 100644 index 00000000000..3ab37929b2c --- /dev/null +++ b/build/pkgs/pygments/distros/debian.txt @@ -0,0 +1 @@ +python3-pygments diff --git a/build/pkgs/pygments/distros/fedora.txt b/build/pkgs/pygments/distros/fedora.txt new file mode 100644 index 00000000000..f3e72a89c38 --- /dev/null +++ b/build/pkgs/pygments/distros/fedora.txt @@ -0,0 +1 @@ +python-pygments diff --git a/build/pkgs/pygments/distros/gentoo.txt b/build/pkgs/pygments/distros/gentoo.txt new file mode 100644 index 00000000000..a584f321e71 --- /dev/null +++ b/build/pkgs/pygments/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pygments diff --git a/build/pkgs/pygments/distros/opensuse.txt b/build/pkgs/pygments/distros/opensuse.txt index 9ff5740e79c..ef63366ff27 100644 --- a/build/pkgs/pygments/distros/opensuse.txt +++ b/build/pkgs/pygments/distros/opensuse.txt @@ -1 +1 @@ -python3-Pygments +python3${PYTHON_MINOR}-pygments diff --git a/build/pkgs/pygments/install-requires.txt b/build/pkgs/pygments/install-requires.txt index 0d0dc97d523..337e5bbad8b 100644 --- a/build/pkgs/pygments/install-requires.txt +++ b/build/pkgs/pygments/install-requires.txt @@ -1 +1 @@ -pygments >=2.3.1 +pygments >=2.12 diff --git a/build/pkgs/pygments/spkg-configure.m4 b/build/pkgs/pygments/spkg-configure.m4 new file mode 100644 index 00000000000..99f29e3c9b3 --- /dev/null +++ b/build/pkgs/pygments/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pygments], [SAGE_PYTHON_PACKAGE_CHECK([pygments])]) diff --git a/build/pkgs/pygraphviz/dependencies b/build/pkgs/pygraphviz/dependencies index 232dc205925..a723707e09c 100644 --- a/build/pkgs/pygraphviz/dependencies +++ b/build/pkgs/pygraphviz/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) libgraphviz | $(PYTHON_TOOLCHAIN) + libgraphviz | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pynormaliz/dependencies b/build/pkgs/pynormaliz/dependencies index 76200c19d23..1fca858579e 100644 --- a/build/pkgs/pynormaliz/dependencies +++ b/build/pkgs/pynormaliz/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) normaliz | $(PYTHON_TOOLCHAIN) + normaliz | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyparsing/dependencies b/build/pkgs/pyparsing/dependencies index 2471ffdf59d..22915b3da68 100644 --- a/build/pkgs/pyparsing/dependencies +++ b/build/pkgs/pyparsing/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip wheel flit_core tomli + | pip wheel flit_core tomli $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyparsing/distros/arch.txt b/build/pkgs/pyparsing/distros/arch.txt new file mode 100644 index 00000000000..428820c215f --- /dev/null +++ b/build/pkgs/pyparsing/distros/arch.txt @@ -0,0 +1 @@ +python-pyparsing diff --git a/build/pkgs/pyparsing/distros/freebsd.txt b/build/pkgs/pyparsing/distros/freebsd.txt new file mode 100644 index 00000000000..39fdc921fd0 --- /dev/null +++ b/build/pkgs/pyparsing/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-pyparsing diff --git a/build/pkgs/pyparsing/distros/gentoo.txt b/build/pkgs/pyparsing/distros/gentoo.txt new file mode 100644 index 00000000000..ef0419f9cbc --- /dev/null +++ b/build/pkgs/pyparsing/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pyparsing diff --git a/build/pkgs/pyparsing/distros/opensuse.txt b/build/pkgs/pyparsing/distros/opensuse.txt index 492a7ce0a69..2a91a003cf9 100644 --- a/build/pkgs/pyparsing/distros/opensuse.txt +++ b/build/pkgs/pyparsing/distros/opensuse.txt @@ -1 +1 @@ -python3-pyparsing +python3${PYTHON_MINOR}-pyparsing diff --git a/build/pkgs/pyparsing/spkg-configure.m4 b/build/pkgs/pyparsing/spkg-configure.m4 new file mode 100644 index 00000000000..d2b4c0055e4 --- /dev/null +++ b/build/pkgs/pyparsing/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pyparsing], [SAGE_PYTHON_PACKAGE_CHECK([pyparsing])]) diff --git a/build/pkgs/pyppeteer/dependencies b/build/pkgs/pyppeteer/dependencies index 1c2d4afb8d4..7d9ec36f9c7 100644 --- a/build/pkgs/pyppeteer/dependencies +++ b/build/pkgs/pyppeteer/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) appdirs importlib_metadata urllib3 certifi | $(PYTHON_TOOLCHAIN) + appdirs importlib_metadata urllib3 certifi | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyproject_metadata/dependencies b/build/pkgs/pyproject_metadata/dependencies index 6d5368db738..3df264eee42 100644 --- a/build/pkgs/pyproject_metadata/dependencies +++ b/build/pkgs/pyproject_metadata/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) packaging pyparsing | $(PYTHON_TOOLCHAIN) + packaging pyparsing | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyrsistent/dependencies b/build/pkgs/pyrsistent/dependencies index 4361e46ddaf..9be6b4aab7c 100644 --- a/build/pkgs/pyrsistent/dependencies +++ b/build/pkgs/pyrsistent/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) vcversioner | $(PYTHON_TOOLCHAIN) + vcversioner | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyrsistent/distros/gentoo.txt b/build/pkgs/pyrsistent/distros/gentoo.txt new file mode 100644 index 00000000000..83439cebfe4 --- /dev/null +++ b/build/pkgs/pyrsistent/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pyrsistent diff --git a/build/pkgs/pyrsistent/spkg-configure.m4 b/build/pkgs/pyrsistent/spkg-configure.m4 new file mode 100644 index 00000000000..f7ca75dbac5 --- /dev/null +++ b/build/pkgs/pyrsistent/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pyrsistent], [SAGE_PYTHON_PACKAGE_CHECK([pyrsistent])]) diff --git a/build/pkgs/pyscipopt/dependencies b/build/pkgs/pyscipopt/dependencies index 66f72c29e1a..3c4a108db0f 100644 --- a/build/pkgs/pyscipopt/dependencies +++ b/build/pkgs/pyscipopt/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) scip | $(PYTHON_TOOLCHAIN) cython + scip | $(PYTHON_TOOLCHAIN) cython $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pysingular/dependencies b/build/pkgs/pysingular/dependencies index bd58b826630..075bad15831 100644 --- a/build/pkgs/pysingular/dependencies +++ b/build/pkgs/pysingular/dependencies @@ -1 +1 @@ -$(PYTHON) singular | $(PYTHON_TOOLCHAIN) + singular | $(PYTHON_TOOLCHAIN) $(PYTHON) diff --git a/build/pkgs/pytest/dependencies b/build/pkgs/pytest/dependencies index 7e5a90a20bd..af3334a7daf 100644 --- a/build/pkgs/pytest/dependencies +++ b/build/pkgs/pytest/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pluggy packaging attrs py pyparsing importlib_metadata tomli | $(PYTHON_TOOLCHAIN) + pluggy packaging attrs py pyparsing importlib_metadata tomli | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pytest_mock/dependencies b/build/pkgs/pytest_mock/dependencies index 37ea60eb442..720c11ec214 100644 --- a/build/pkgs/pytest_mock/dependencies +++ b/build/pkgs/pytest_mock/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pytest packaging attrs pluggy tomli py pyparsing | $(PYTHON_TOOLCHAIN) + pytest packaging attrs pluggy tomli py pyparsing | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pytest_xdist/dependencies b/build/pkgs/pytest_xdist/dependencies index aa8c608f663..19d8b032667 100644 --- a/build/pkgs/pytest_xdist/dependencies +++ b/build/pkgs/pytest_xdist/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pytest | $(PYTHON_TOOLCHAIN) + pytest | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/python3/distros/opensuse.txt b/build/pkgs/python3/distros/opensuse.txt index 07358a92e89..760ddd76f2c 100644 --- a/build/pkgs/python3/distros/opensuse.txt +++ b/build/pkgs/python3/distros/opensuse.txt @@ -1 +1 @@ -python3-devel +python3${PYTHON_MINOR}-devel diff --git a/build/pkgs/python3/spkg-configure.m4 b/build/pkgs/python3/spkg-configure.m4 index 5a0aa955633..d57aa416e3a 100644 --- a/build/pkgs/python3/spkg-configure.m4 +++ b/build/pkgs/python3/spkg-configure.m4 @@ -130,17 +130,17 @@ To build Sage with a different system python, use ./configure --with-python=/pat ]) AC_SUBST([PYTHON_FOR_VENV]) + AS_IF([test -n "$PYTHON_FOR_VENV"], + [PYTHON_VERSION=$("$PYTHON_FOR_VENV" -c "import sysconfig; print(sysconfig.get_python_version())")], + [PYTHON_VERSION=$(echo $(cat build/pkgs/python3/package-version.txt))]) + AC_SUBST([PYTHON_MINOR], [$(echo $PYTHON_VERSION | cut -d. -f2)]) + export PYTHON_MINOR # for sage-get-system-packages + AS_VAR_IF([SAGE_VENV], [auto], [SAGE_VENV=$SAGE_VENV_AUTO]) AS_CASE([$SAGE_VENV], [no], [SAGE_VENV='${SAGE_LOCAL}'],dnl Quoted so that it is resolved at build time by shell/Makefile - [yes], [AS_IF([test -n "$PYTHON_FOR_VENV"], [ - PYTHON_VERSION=$("$PYTHON_FOR_VENV" -c "import sysconfig; print(sysconfig.get_python_version())") - ], [ - PYTHON_VERSION=$(echo $(cat build/pkgs/python3/package-version.txt)) - ]) - SAGE_VENV='${SAGE_LOCAL}'/var/lib/sage/venv-python$PYTHON_VERSION] + [yes], [SAGE_VENV='${SAGE_LOCAL}'/var/lib/sage/venv-python$PYTHON_VERSION] ) - dnl These temporary directories are created by the check above dnl and need to be cleaned up to prevent the "rm -f conftest*" dnl (that a bunch of other checks do) from emitting warnings about diff --git a/build/pkgs/python_build/dependencies b/build/pkgs/python_build/dependencies index 769e08a8c26..b72a6d1c776 100644 --- a/build/pkgs/python_build/dependencies +++ b/build/pkgs/python_build/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pyparsing tomli packaging | $(PYTHON_TOOLCHAIN) + pyparsing tomli packaging | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/python_igraph/dependencies b/build/pkgs/python_igraph/dependencies index 67ed15160f4..dde58706323 100644 --- a/build/pkgs/python_igraph/dependencies +++ b/build/pkgs/python_igraph/dependencies @@ -1,4 +1,4 @@ -igraph texttable $(PYTHON) | $(PYTHON_TOOLCHAIN) +igraph texttable | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/python_igraph/distros/arch.txt b/build/pkgs/python_igraph/distros/arch.txt new file mode 100644 index 00000000000..03f8142066f --- /dev/null +++ b/build/pkgs/python_igraph/distros/arch.txt @@ -0,0 +1 @@ +python-igraph diff --git a/build/pkgs/python_igraph/distros/debian.txt b/build/pkgs/python_igraph/distros/debian.txt new file mode 100644 index 00000000000..218ba998007 --- /dev/null +++ b/build/pkgs/python_igraph/distros/debian.txt @@ -0,0 +1 @@ +python3-igraph diff --git a/build/pkgs/python_igraph/distros/fedora.txt b/build/pkgs/python_igraph/distros/fedora.txt new file mode 100644 index 00000000000..03f8142066f --- /dev/null +++ b/build/pkgs/python_igraph/distros/fedora.txt @@ -0,0 +1 @@ +python-igraph diff --git a/build/pkgs/python_igraph/distros/freebsd.txt b/build/pkgs/python_igraph/distros/freebsd.txt new file mode 100644 index 00000000000..d86a516f3ed --- /dev/null +++ b/build/pkgs/python_igraph/distros/freebsd.txt @@ -0,0 +1 @@ +math/py-igraph diff --git a/build/pkgs/pythran/dependencies b/build/pkgs/pythran/dependencies index 8a64589c0bc..3845adb7a2c 100644 --- a/build/pkgs/pythran/dependencies +++ b/build/pkgs/pythran/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) beniget gast ply numpy | $(PYTHON_TOOLCHAIN) + beniget gast ply numpy | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pythran/distros/gentoo.txt b/build/pkgs/pythran/distros/gentoo.txt new file mode 100644 index 00000000000..1bb7cdcd4eb --- /dev/null +++ b/build/pkgs/pythran/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pythran diff --git a/build/pkgs/pythran/install-requires.txt b/build/pkgs/pythran/install-requires.txt index 86d056b339f..f365e5f4971 100644 --- a/build/pkgs/pythran/install-requires.txt +++ b/build/pkgs/pythran/install-requires.txt @@ -1 +1 @@ -pythran +pythran >=0.12.1 diff --git a/build/pkgs/pythran/spkg-configure.m4 b/build/pkgs/pythran/spkg-configure.m4 new file mode 100644 index 00000000000..592e95bcb3d --- /dev/null +++ b/build/pkgs/pythran/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pythran], [SAGE_PYTHON_PACKAGE_CHECK([pythran])]) diff --git a/build/pkgs/pytz/dependencies b/build/pkgs/pytz/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/pytz/dependencies +++ b/build/pkgs/pytz/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pytz/distros/arch.txt b/build/pkgs/pytz/distros/arch.txt new file mode 100644 index 00000000000..2cccc9e61ec --- /dev/null +++ b/build/pkgs/pytz/distros/arch.txt @@ -0,0 +1 @@ +python-pytz diff --git a/build/pkgs/pytz/distros/debian.txt b/build/pkgs/pytz/distros/debian.txt new file mode 100644 index 00000000000..db209080161 --- /dev/null +++ b/build/pkgs/pytz/distros/debian.txt @@ -0,0 +1 @@ +python3-tz diff --git a/build/pkgs/pytz/distros/fedora.txt b/build/pkgs/pytz/distros/fedora.txt new file mode 100644 index 00000000000..2cccc9e61ec --- /dev/null +++ b/build/pkgs/pytz/distros/fedora.txt @@ -0,0 +1 @@ +python-pytz diff --git a/build/pkgs/pytz/distros/gentoo.txt b/build/pkgs/pytz/distros/gentoo.txt new file mode 100644 index 00000000000..902a18bf73e --- /dev/null +++ b/build/pkgs/pytz/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pytz diff --git a/build/pkgs/pytz/distros/opensuse.txt b/build/pkgs/pytz/distros/opensuse.txt index 1b20e1dbb77..232b99a6d04 100644 --- a/build/pkgs/pytz/distros/opensuse.txt +++ b/build/pkgs/pytz/distros/opensuse.txt @@ -1 +1 @@ -python3-pytz +python3${PYTHON_MINOR}-pytz diff --git a/build/pkgs/pytz/spkg-configure.m4 b/build/pkgs/pytz/spkg-configure.m4 new file mode 100644 index 00000000000..366521be957 --- /dev/null +++ b/build/pkgs/pytz/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([pytz], [SAGE_PYTHON_PACKAGE_CHECK([pytz])]) diff --git a/build/pkgs/pytz_deprecation_shim/dependencies b/build/pkgs/pytz_deprecation_shim/dependencies index 232fe6c0554..2ea28ad2718 100644 --- a/build/pkgs/pytz_deprecation_shim/dependencies +++ b/build/pkgs/pytz_deprecation_shim/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) tzdata | $(PYTHON_TOOLCHAIN) + tzdata | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyx/distros/opensuse.txt b/build/pkgs/pyx/distros/opensuse.txt index 03265558e86..f7dd2365b82 100644 --- a/build/pkgs/pyx/distros/opensuse.txt +++ b/build/pkgs/pyx/distros/opensuse.txt @@ -1 +1 @@ -python3-PyX +python3${PYTHON_MINOR}-PyX diff --git a/build/pkgs/pyzmq/dependencies b/build/pkgs/pyzmq/dependencies index c72b3d23340..5031d872d13 100644 --- a/build/pkgs/pyzmq/dependencies +++ b/build/pkgs/pyzmq/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython zeromq | $(PYTHON_TOOLCHAIN) + cython zeromq | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pyzmq/distros/arch.txt b/build/pkgs/pyzmq/distros/arch.txt new file mode 100644 index 00000000000..23f64d1f1a3 --- /dev/null +++ b/build/pkgs/pyzmq/distros/arch.txt @@ -0,0 +1 @@ +python-pyzmq diff --git a/build/pkgs/pyzmq/distros/fedora.txt b/build/pkgs/pyzmq/distros/fedora.txt new file mode 100644 index 00000000000..23f64d1f1a3 --- /dev/null +++ b/build/pkgs/pyzmq/distros/fedora.txt @@ -0,0 +1 @@ +python-pyzmq diff --git a/build/pkgs/pyzmq/distros/gentoo.txt b/build/pkgs/pyzmq/distros/gentoo.txt new file mode 100644 index 00000000000..77c24295bd0 --- /dev/null +++ b/build/pkgs/pyzmq/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/pyzmq diff --git a/build/pkgs/pyzmq/distros/opensuse.txt b/build/pkgs/pyzmq/distros/opensuse.txt index 265a272130e..fe243347c49 100644 --- a/build/pkgs/pyzmq/distros/opensuse.txt +++ b/build/pkgs/pyzmq/distros/opensuse.txt @@ -1 +1 @@ -python3-pyzmq +python3${PYTHON_MINOR}-pyzmq diff --git a/build/pkgs/pyzmq/spkg-configure.m4 b/build/pkgs/pyzmq/spkg-configure.m4 new file mode 100644 index 00000000000..ae2b126efb1 --- /dev/null +++ b/build/pkgs/pyzmq/spkg-configure.m4 @@ -0,0 +1,5 @@ +SAGE_SPKG_CONFIGURE([pyzmq], [ + SAGE_SPKG_DEPCHECK([zeromq], [ + SAGE_PYTHON_PACKAGE_CHECK([pyzmq]) + ]) +]) diff --git a/build/pkgs/qdldl_python/dependencies b/build/pkgs/qdldl_python/dependencies index 48c2586b9f4..757104fcba0 100644 --- a/build/pkgs/qdldl_python/dependencies +++ b/build/pkgs/qdldl_python/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pybind11 numpy scipy | $(PYTHON_TOOLCHAIN) cmake + pybind11 numpy scipy | $(PYTHON_TOOLCHAIN) cmake $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/requests/dependencies b/build/pkgs/requests/dependencies index b896dbc3cac..668fe014f12 100644 --- a/build/pkgs/requests/dependencies +++ b/build/pkgs/requests/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) idna urllib3 certifi charset_normalizer + | $(PYTHON_TOOLCHAIN) idna urllib3 certifi charset_normalizer $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/requests/distros/arch.txt b/build/pkgs/requests/distros/arch.txt new file mode 100644 index 00000000000..93a7bc19b60 --- /dev/null +++ b/build/pkgs/requests/distros/arch.txt @@ -0,0 +1 @@ +python-requests diff --git a/build/pkgs/requests/distros/debian.txt b/build/pkgs/requests/distros/debian.txt new file mode 100644 index 00000000000..43147b2be74 --- /dev/null +++ b/build/pkgs/requests/distros/debian.txt @@ -0,0 +1 @@ +python3-requests diff --git a/build/pkgs/requests/distros/fedora.txt b/build/pkgs/requests/distros/fedora.txt new file mode 100644 index 00000000000..93a7bc19b60 --- /dev/null +++ b/build/pkgs/requests/distros/fedora.txt @@ -0,0 +1 @@ +python-requests diff --git a/build/pkgs/requests/distros/gentoo.txt b/build/pkgs/requests/distros/gentoo.txt new file mode 100644 index 00000000000..d3dc9415e3d --- /dev/null +++ b/build/pkgs/requests/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/requests diff --git a/build/pkgs/requests/distros/opensuse.txt b/build/pkgs/requests/distros/opensuse.txt index 43147b2be74..c1581ad8a95 100644 --- a/build/pkgs/requests/distros/opensuse.txt +++ b/build/pkgs/requests/distros/opensuse.txt @@ -1 +1 @@ -python3-requests +python3${PYTHON_MINOR}-requests diff --git a/build/pkgs/requests/spkg-configure.m4 b/build/pkgs/requests/spkg-configure.m4 new file mode 100644 index 00000000000..f50a66cdee3 --- /dev/null +++ b/build/pkgs/requests/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([requests], [SAGE_PYTHON_PACKAGE_CHECK([requests])]) diff --git a/build/pkgs/retrolab/dependencies b/build/pkgs/retrolab/dependencies index 531f28310be..58027d3558c 100644 --- a/build/pkgs/retrolab/dependencies +++ b/build/pkgs/retrolab/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) jupyterlab | $(PYTHON_TOOLCHAIN) + jupyterlab | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/rpy2/dependencies b/build/pkgs/rpy2/dependencies index b8937d88769..b88615716d4 100644 --- a/build/pkgs/rpy2/dependencies +++ b/build/pkgs/rpy2/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) r cffi tzlocal pytz jinja2 | $(PYTHON_TOOLCHAIN) pycparser + r cffi tzlocal pytz jinja2 | $(PYTHON_TOOLCHAIN) pycparser $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/rpy2/distros/arch.txt b/build/pkgs/rpy2/distros/arch.txt new file mode 100644 index 00000000000..9748535a285 --- /dev/null +++ b/build/pkgs/rpy2/distros/arch.txt @@ -0,0 +1 @@ +python-rpy2 diff --git a/build/pkgs/rpy2/distros/debian.txt b/build/pkgs/rpy2/distros/debian.txt new file mode 100644 index 00000000000..8f389862688 --- /dev/null +++ b/build/pkgs/rpy2/distros/debian.txt @@ -0,0 +1 @@ +rpy2 diff --git a/build/pkgs/rpy2/distros/freebsd.txt b/build/pkgs/rpy2/distros/freebsd.txt new file mode 100644 index 00000000000..21caa8b9edd --- /dev/null +++ b/build/pkgs/rpy2/distros/freebsd.txt @@ -0,0 +1 @@ +math/py-rpy2 diff --git a/build/pkgs/rpy2/distros/macports.txt b/build/pkgs/rpy2/distros/macports.txt new file mode 100644 index 00000000000..71f03850a9b --- /dev/null +++ b/build/pkgs/rpy2/distros/macports.txt @@ -0,0 +1 @@ +py-rpy2 diff --git a/build/pkgs/rpy2/distros/opensuse.txt b/build/pkgs/rpy2/distros/opensuse.txt new file mode 100644 index 00000000000..5b9c1542845 --- /dev/null +++ b/build/pkgs/rpy2/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-rpy2 diff --git a/build/pkgs/rst2ipynb/dependencies b/build/pkgs/rst2ipynb/dependencies index 7fcda2181e1..d828daf957d 100644 --- a/build/pkgs/rst2ipynb/dependencies +++ b/build/pkgs/rst2ipynb/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pandoc | $(PYTHON_TOOLCHAIN) notedown + pandoc | $(PYTHON_TOOLCHAIN) notedown $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies index 0479fd1d280..f2bd00aaf0d 100644 --- a/build/pkgs/sage_conf/dependencies +++ b/build/pkgs/sage_conf/dependencies @@ -1 +1 @@ -$(PYTHON) $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/setup.cfg $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN) + $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/setup.cfg $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN) $(PYTHON) diff --git a/build/pkgs/sage_docbuild/dependencies b/build/pkgs/sage_docbuild/dependencies index 376ad09772a..c21e4b287e3 100644 --- a/build/pkgs/sage_docbuild/dependencies +++ b/build/pkgs/sage_docbuild/dependencies @@ -1 +1 @@ -$(PYTHON) sphinx $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/*.py $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/ext/*.py | $(PYTHON_TOOLCHAIN) sagelib + sphinx $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/*.py $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/ext/*.py | $(PYTHON_TOOLCHAIN) sagelib $(PYTHON) diff --git a/build/pkgs/sage_flatsurf/dependencies b/build/pkgs/sage_flatsurf/dependencies index 4c62fdd4fef..c706908baa7 100644 --- a/build/pkgs/sage_flatsurf/dependencies +++ b/build/pkgs/sage_flatsurf/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) surface_dynamics $(SAGERUNTIME) + | $(PYTHON_TOOLCHAIN) surface_dynamics $(SAGERUNTIME) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sage_numerical_backends_coin/dependencies b/build/pkgs/sage_numerical_backends_coin/dependencies index 4cbde1164f2..0448728cea5 100644 --- a/build/pkgs/sage_numerical_backends_coin/dependencies +++ b/build/pkgs/sage_numerical_backends_coin/dependencies @@ -1,4 +1,4 @@ -cbc cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets +cbc cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sage_numerical_backends_cplex/dependencies b/build/pkgs/sage_numerical_backends_cplex/dependencies index 0b35afa3540..840bdcabd34 100644 --- a/build/pkgs/sage_numerical_backends_cplex/dependencies +++ b/build/pkgs/sage_numerical_backends_cplex/dependencies @@ -1,4 +1,4 @@ -cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets +cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sage_numerical_backends_gurobi/dependencies b/build/pkgs/sage_numerical_backends_gurobi/dependencies index 0b35afa3540..840bdcabd34 100644 --- a/build/pkgs/sage_numerical_backends_gurobi/dependencies +++ b/build/pkgs/sage_numerical_backends_gurobi/dependencies @@ -1,4 +1,4 @@ -cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets +cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sage_setup/dependencies b/build/pkgs/sage_setup/dependencies index 8c2e218f49a..cae3faf9049 100644 --- a/build/pkgs/sage_setup/dependencies +++ b/build/pkgs/sage_setup/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN) + cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sage_sws2rst/dependencies b/build/pkgs/sage_sws2rst/dependencies index 5ca5e27df75..f32c4fc594d 100644 --- a/build/pkgs/sage_sws2rst/dependencies +++ b/build/pkgs/sage_sws2rst/dependencies @@ -1 +1 @@ -$(PYTHON) beautifulsoup4 $(SAGE_ROOT)/pkgs/sage-sws2rst/*.py | $(PYTHON_TOOLCHAIN) + beautifulsoup4 $(SAGE_ROOT)/pkgs/sage-sws2rst/*.py | $(PYTHON_TOOLCHAIN) $(PYTHON) diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies index 04da0bd14ea..5f1ed036f8e 100644 --- a/build/pkgs/sagelib/dependencies +++ b/build/pkgs/sagelib/dependencies @@ -1,4 +1,4 @@ -FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup pythran +FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies index 279e79ace91..a7915e316b9 100644 --- a/build/pkgs/sagemath_bliss/dependencies +++ b/build/pkgs/sagemath_bliss/dependencies @@ -1 +1 @@ -$(PYTHON) bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig + bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_categories/dependencies b/build/pkgs/sagemath_categories/dependencies index d8b6bdbd4a7..9fa43a64aae 100644 --- a/build/pkgs/sagemath_categories/dependencies +++ b/build/pkgs/sagemath_categories/dependencies @@ -1 +1 @@ -$(PYTHON) sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build + sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON) diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies index 615392ca427..ada45656089 100644 --- a/build/pkgs/sagemath_coxeter3/dependencies +++ b/build/pkgs/sagemath_coxeter3/dependencies @@ -1 +1 @@ -$(PYTHON) coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig + coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_environment/dependencies b/build/pkgs/sagemath_environment/dependencies index 605611e7a21..0f36ec317e6 100644 --- a/build/pkgs/sagemath_environment/dependencies +++ b/build/pkgs/sagemath_environment/dependencies @@ -1 +1 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) python_build + | $(PYTHON_TOOLCHAIN) python_build $(PYTHON) diff --git a/build/pkgs/sagemath_mcqd/dependencies b/build/pkgs/sagemath_mcqd/dependencies index e383df7dafa..9896fdaccfc 100644 --- a/build/pkgs/sagemath_mcqd/dependencies +++ b/build/pkgs/sagemath_mcqd/dependencies @@ -1 +1 @@ -$(PYTHON) mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig + mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies index f100932802a..c333fcc61db 100644 --- a/build/pkgs/sagemath_meataxe/dependencies +++ b/build/pkgs/sagemath_meataxe/dependencies @@ -1 +1 @@ -$(PYTHON) meataxe | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig + meataxe | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_objects/dependencies b/build/pkgs/sagemath_objects/dependencies index 807b8b17215..ffc14bb6ba6 100644 --- a/build/pkgs/sagemath_objects/dependencies +++ b/build/pkgs/sagemath_objects/dependencies @@ -1,3 +1,3 @@ -FORCE $(PYTHON) cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build +FORCE cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON) # FORCE: Always run the spkg-install script diff --git a/build/pkgs/sagemath_repl/dependencies b/build/pkgs/sagemath_repl/dependencies index ebc253dac5b..7d7ba20c5dd 100644 --- a/build/pkgs/sagemath_repl/dependencies +++ b/build/pkgs/sagemath_repl/dependencies @@ -1 +1 @@ -$(PYTHON) sagemath_objects sagemath_environment ipython ipywidgets | $(PYTHON_TOOLCHAIN) python_build + sagemath_objects sagemath_environment ipython ipywidgets | $(PYTHON_TOOLCHAIN) python_build $(PYTHON) diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies index b923f34d7eb..4f47049ec4b 100644 --- a/build/pkgs/sagemath_sirocco/dependencies +++ b/build/pkgs/sagemath_sirocco/dependencies @@ -1 +1 @@ -$(PYTHON) sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig + sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies index 5c7ecd31f2f..b22ab6c52a7 100644 --- a/build/pkgs/sagemath_tdlib/dependencies +++ b/build/pkgs/sagemath_tdlib/dependencies @@ -1 +1 @@ -$(PYTHON) tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig + tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagenb_export/dependencies b/build/pkgs/sagenb_export/dependencies index 26033350f88..f9a2f2adbb9 100644 --- a/build/pkgs/sagenb_export/dependencies +++ b/build/pkgs/sagenb_export/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) notebook nbconvert ipython six | $(PYTHON_TOOLCHAIN) + notebook nbconvert ipython six | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sagetex/dependencies b/build/pkgs/sagetex/dependencies index 6090d5dc3ac..af9b5f370fb 100644 --- a/build/pkgs/sagetex/dependencies +++ b/build/pkgs/sagetex/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) maxima scipy matplotlib pillow tachyon pyparsing + maxima scipy matplotlib pillow tachyon pyparsing | $(PYTHON) To build SageTeX, you just need Python and pyparsing, but to test (SAGE_CHECK=yes) SageTeX, you actually need to run Sage, produce plots,... diff --git a/build/pkgs/scipy/dependencies b/build/pkgs/scipy/dependencies index 5d42789eb10..82fa8e0c0d7 100644 --- a/build/pkgs/scipy/dependencies +++ b/build/pkgs/scipy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) $(BLAS) gfortran numpy pybind11 cython pythran | $(PYTHON_TOOLCHAIN) meson_python + $(BLAS) gfortran numpy pybind11 cython pythran | $(PYTHON_TOOLCHAIN) meson_python $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/scipy/distros/arch.txt b/build/pkgs/scipy/distros/arch.txt new file mode 100644 index 00000000000..7ff2882c1bf --- /dev/null +++ b/build/pkgs/scipy/distros/arch.txt @@ -0,0 +1 @@ +python-scipy diff --git a/build/pkgs/scipy/distros/debian.txt b/build/pkgs/scipy/distros/debian.txt new file mode 100644 index 00000000000..12b366666d6 --- /dev/null +++ b/build/pkgs/scipy/distros/debian.txt @@ -0,0 +1 @@ +python3-scipy diff --git a/build/pkgs/scipy/distros/fedora.txt b/build/pkgs/scipy/distros/fedora.txt new file mode 100644 index 00000000000..7ff2882c1bf --- /dev/null +++ b/build/pkgs/scipy/distros/fedora.txt @@ -0,0 +1 @@ +python-scipy diff --git a/build/pkgs/scipy/distros/gentoo.txt b/build/pkgs/scipy/distros/gentoo.txt new file mode 100644 index 00000000000..11dabd2830f --- /dev/null +++ b/build/pkgs/scipy/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/scipy diff --git a/build/pkgs/scipy/distros/opensuse.txt b/build/pkgs/scipy/distros/opensuse.txt index 12b366666d6..d2bc2a30a85 100644 --- a/build/pkgs/scipy/distros/opensuse.txt +++ b/build/pkgs/scipy/distros/opensuse.txt @@ -1 +1 @@ -python3-scipy +python3${PYTHON_MINOR}-scipy diff --git a/build/pkgs/scipy/spkg-configure.m4 b/build/pkgs/scipy/spkg-configure.m4 new file mode 100644 index 00000000000..0b7294a02e8 --- /dev/null +++ b/build/pkgs/scipy/spkg-configure.m4 @@ -0,0 +1,5 @@ +SAGE_SPKG_CONFIGURE([scipy], [ + SAGE_SPKG_DEPCHECK([openblas], [ + SAGE_PYTHON_PACKAGE_CHECK([scipy]) + ]) +]) diff --git a/build/pkgs/scs/dependencies b/build/pkgs/scs/dependencies index 56c3c7a111c..a736df74ec5 100644 --- a/build/pkgs/scs/dependencies +++ b/build/pkgs/scs/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) numpy | $(PYTHON_TOOLCHAIN) cmake + numpy | $(PYTHON_TOOLCHAIN) cmake $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/send2trash/dependencies b/build/pkgs/send2trash/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/send2trash/dependencies +++ b/build/pkgs/send2trash/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/send2trash/distros/gentoo.txt b/build/pkgs/send2trash/distros/gentoo.txt new file mode 100644 index 00000000000..a89b1798476 --- /dev/null +++ b/build/pkgs/send2trash/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/send2trash diff --git a/build/pkgs/send2trash/distros/opensuse.txt b/build/pkgs/send2trash/distros/opensuse.txt index 404e2bd3580..8d3c81fa23c 100644 --- a/build/pkgs/send2trash/distros/opensuse.txt +++ b/build/pkgs/send2trash/distros/opensuse.txt @@ -1 +1 @@ -python3-Send2Trash +python3${PYTHON_MINOR}-Send2Trash diff --git a/build/pkgs/send2trash/spkg-configure.m4 b/build/pkgs/send2trash/spkg-configure.m4 new file mode 100644 index 00000000000..3bbb727e430 --- /dev/null +++ b/build/pkgs/send2trash/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([send2trash], [SAGE_PYTHON_PACKAGE_CHECK([send2trash])]) diff --git a/build/pkgs/setuptools/dependencies b/build/pkgs/setuptools/dependencies index 1700e743d59..d45a397db36 100644 --- a/build/pkgs/setuptools/dependencies +++ b/build/pkgs/setuptools/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) + | $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/setuptools/distros/arch.txt b/build/pkgs/setuptools/distros/arch.txt new file mode 100644 index 00000000000..e1ad17860cd --- /dev/null +++ b/build/pkgs/setuptools/distros/arch.txt @@ -0,0 +1 @@ +python-setuptools diff --git a/build/pkgs/setuptools/distros/debian.txt b/build/pkgs/setuptools/distros/debian.txt new file mode 100644 index 00000000000..1c0901c0374 --- /dev/null +++ b/build/pkgs/setuptools/distros/debian.txt @@ -0,0 +1 @@ +python3-setuptools diff --git a/build/pkgs/setuptools/distros/fedora.txt b/build/pkgs/setuptools/distros/fedora.txt new file mode 100644 index 00000000000..e1ad17860cd --- /dev/null +++ b/build/pkgs/setuptools/distros/fedora.txt @@ -0,0 +1 @@ +python-setuptools diff --git a/build/pkgs/setuptools/distros/gentoo.txt b/build/pkgs/setuptools/distros/gentoo.txt new file mode 100644 index 00000000000..3a4fa34a57f --- /dev/null +++ b/build/pkgs/setuptools/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/setuptools diff --git a/build/pkgs/setuptools/distros/opensuse.txt b/build/pkgs/setuptools/distros/opensuse.txt index 1c0901c0374..b2d8de78f80 100644 --- a/build/pkgs/setuptools/distros/opensuse.txt +++ b/build/pkgs/setuptools/distros/opensuse.txt @@ -1 +1 @@ -python3-setuptools +python3${PYTHON_MINOR}-setuptools diff --git a/build/pkgs/setuptools/install-requires.txt b/build/pkgs/setuptools/install-requires.txt index 0810ca37277..e0cf7c9b5dc 100644 --- a/build/pkgs/setuptools/install-requires.txt +++ b/build/pkgs/setuptools/install-requires.txt @@ -1 +1 @@ -setuptools >=49.6.0 +setuptools >=49.6.0, <64 diff --git a/build/pkgs/setuptools/spkg-configure.m4 b/build/pkgs/setuptools/spkg-configure.m4 new file mode 100644 index 00000000000..a2ad8119063 --- /dev/null +++ b/build/pkgs/setuptools/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([setuptools], [SAGE_PYTHON_PACKAGE_CHECK([setuptools])]) diff --git a/build/pkgs/setuptools_scm/dependencies b/build/pkgs/setuptools_scm/dependencies index f3662a5c829..7dd3b6e8f6e 100644 --- a/build/pkgs/setuptools_scm/dependencies +++ b/build/pkgs/setuptools_scm/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) typing_extensions | setuptools pip wheel tomli packaging + typing_extensions | setuptools pip wheel tomli packaging $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/setuptools_scm/distros/arch.txt b/build/pkgs/setuptools_scm/distros/arch.txt new file mode 100644 index 00000000000..2b97444decf --- /dev/null +++ b/build/pkgs/setuptools_scm/distros/arch.txt @@ -0,0 +1 @@ +python-setuptools-scm diff --git a/build/pkgs/setuptools_scm/distros/debian.txt b/build/pkgs/setuptools_scm/distros/debian.txt new file mode 100644 index 00000000000..bcfdd6ebcdd --- /dev/null +++ b/build/pkgs/setuptools_scm/distros/debian.txt @@ -0,0 +1 @@ +setuptools-scm diff --git a/build/pkgs/setuptools_scm/distros/fedora.txt b/build/pkgs/setuptools_scm/distros/fedora.txt new file mode 100644 index 00000000000..720fd2897be --- /dev/null +++ b/build/pkgs/setuptools_scm/distros/fedora.txt @@ -0,0 +1 @@ +python-setuptools_scm diff --git a/build/pkgs/setuptools_scm/distros/freebsd.txt b/build/pkgs/setuptools_scm/distros/freebsd.txt new file mode 100644 index 00000000000..ba714681e0a --- /dev/null +++ b/build/pkgs/setuptools_scm/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-setuptools_scm diff --git a/build/pkgs/setuptools_scm/distros/gentoo.txt b/build/pkgs/setuptools_scm/distros/gentoo.txt new file mode 100644 index 00000000000..46efc2bdeb4 --- /dev/null +++ b/build/pkgs/setuptools_scm/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/setuptools-scm diff --git a/build/pkgs/setuptools_scm/distros/opensuse.txt b/build/pkgs/setuptools_scm/distros/opensuse.txt index 2aa5ca12cba..cacb303c566 100644 --- a/build/pkgs/setuptools_scm/distros/opensuse.txt +++ b/build/pkgs/setuptools_scm/distros/opensuse.txt @@ -1 +1 @@ -python3-setuptools_scm +python3${PYTHON_MINOR}-setuptools_scm diff --git a/build/pkgs/setuptools_scm/install-requires.txt b/build/pkgs/setuptools_scm/install-requires.txt index ee00ef62d52..34188327a0f 100644 --- a/build/pkgs/setuptools_scm/install-requires.txt +++ b/build/pkgs/setuptools_scm/install-requires.txt @@ -1 +1,2 @@ -setuptools_scm >=4.1.2 +# matplotlib-3.6.2 needs >= 7 +setuptools_scm >=7 diff --git a/build/pkgs/setuptools_scm/spkg-configure.m4 b/build/pkgs/setuptools_scm/spkg-configure.m4 new file mode 100644 index 00000000000..437148c2a8f --- /dev/null +++ b/build/pkgs/setuptools_scm/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([setuptools_scm], [ + SAGE_PYTHON_PACKAGE_CHECK([setuptools_scm]) +]) diff --git a/build/pkgs/setuptools_scm_git_archive/dependencies b/build/pkgs/setuptools_scm_git_archive/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/setuptools_scm_git_archive/dependencies +++ b/build/pkgs/setuptools_scm_git_archive/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/setuptools_wheel/dependencies b/build/pkgs/setuptools_wheel/dependencies index 618d627629a..dac3579f7e3 100644 --- a/build/pkgs/setuptools_wheel/dependencies +++ b/build/pkgs/setuptools_wheel/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) setuptools wheel + setuptools wheel | $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/simplegeneric/dependencies b/build/pkgs/simplegeneric/dependencies index 703d0ec7ba3..1169eb4105f 100644 --- a/build/pkgs/simplegeneric/dependencies +++ b/build/pkgs/simplegeneric/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) # simplegeneric does not strictly require setuptools, but it does try # to use setuptools if it is available. However, there is a problem diff --git a/build/pkgs/simplegeneric/distros/gentoo.txt b/build/pkgs/simplegeneric/distros/gentoo.txt new file mode 100644 index 00000000000..a86e90d96ec --- /dev/null +++ b/build/pkgs/simplegeneric/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/simplegeneric diff --git a/build/pkgs/simplegeneric/distros/opensuse.txt b/build/pkgs/simplegeneric/distros/opensuse.txt index d788a7233a7..ddc1661a230 100644 --- a/build/pkgs/simplegeneric/distros/opensuse.txt +++ b/build/pkgs/simplegeneric/distros/opensuse.txt @@ -1 +1 @@ -python3-simplegeneric +python3${PYTHON_MINOR}-simplegeneric diff --git a/build/pkgs/simplegeneric/spkg-configure.m4 b/build/pkgs/simplegeneric/spkg-configure.m4 new file mode 100644 index 00000000000..13715ab5f2b --- /dev/null +++ b/build/pkgs/simplegeneric/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([simplegeneric], [SAGE_PYTHON_PACKAGE_CHECK([simplegeneric])]) diff --git a/build/pkgs/singular_jupyter/dependencies b/build/pkgs/singular_jupyter/dependencies index 14dc06f7076..dc15abb82c7 100644 --- a/build/pkgs/singular_jupyter/dependencies +++ b/build/pkgs/singular_jupyter/dependencies @@ -1 +1 @@ -$(PYTHON) jupyter_client | $(PYTHON_TOOLCHAIN) pysingular ipython ipywidgets + jupyter_client | $(PYTHON_TOOLCHAIN) pysingular ipython ipywidgets $(PYTHON) diff --git a/build/pkgs/six/dependencies b/build/pkgs/six/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/six/dependencies +++ b/build/pkgs/six/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/six/distros/arch.txt b/build/pkgs/six/distros/arch.txt new file mode 100644 index 00000000000..787c5308ea4 --- /dev/null +++ b/build/pkgs/six/distros/arch.txt @@ -0,0 +1 @@ +python-six diff --git a/build/pkgs/six/distros/debian.txt b/build/pkgs/six/distros/debian.txt new file mode 100644 index 00000000000..68ff8595d0b --- /dev/null +++ b/build/pkgs/six/distros/debian.txt @@ -0,0 +1 @@ +python3-six diff --git a/build/pkgs/six/distros/fedora.txt b/build/pkgs/six/distros/fedora.txt new file mode 100644 index 00000000000..787c5308ea4 --- /dev/null +++ b/build/pkgs/six/distros/fedora.txt @@ -0,0 +1 @@ +python-six diff --git a/build/pkgs/six/distros/gentoo.txt b/build/pkgs/six/distros/gentoo.txt new file mode 100644 index 00000000000..f73f648ff75 --- /dev/null +++ b/build/pkgs/six/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/six diff --git a/build/pkgs/six/distros/opensuse.txt b/build/pkgs/six/distros/opensuse.txt index 68ff8595d0b..127cfc6a26a 100644 --- a/build/pkgs/six/distros/opensuse.txt +++ b/build/pkgs/six/distros/opensuse.txt @@ -1 +1 @@ -python3-six +python3${PYTHON_MINOR}-six diff --git a/build/pkgs/six/spkg-configure.m4 b/build/pkgs/six/spkg-configure.m4 new file mode 100644 index 00000000000..a382b81a3dd --- /dev/null +++ b/build/pkgs/six/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([six], [SAGE_PYTHON_PACKAGE_CHECK([six])]) diff --git a/build/pkgs/slabbe/dependencies b/build/pkgs/slabbe/dependencies index 05ba0d8954b..126e8ceee06 100644 --- a/build/pkgs/slabbe/dependencies +++ b/build/pkgs/slabbe/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) + | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/snappy/dependencies b/build/pkgs/snappy/dependencies index db96ccc42e0..ceaf757887e 100644 --- a/build/pkgs/snappy/dependencies +++ b/build/pkgs/snappy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) decorator ipython cypari | $(PYTHON_TOOLCHAIN) sagelib + decorator ipython cypari | $(PYTHON_TOOLCHAIN) sagelib $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/snowballstemmer/dependencies b/build/pkgs/snowballstemmer/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/snowballstemmer/dependencies +++ b/build/pkgs/snowballstemmer/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/snowballstemmer/distros/gentoo.txt b/build/pkgs/snowballstemmer/distros/gentoo.txt new file mode 100644 index 00000000000..63fd8513221 --- /dev/null +++ b/build/pkgs/snowballstemmer/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/snowballstemmer diff --git a/build/pkgs/snowballstemmer/distros/opensuse.txt b/build/pkgs/snowballstemmer/distros/opensuse.txt index 09b2636df60..a21cc876a24 100644 --- a/build/pkgs/snowballstemmer/distros/opensuse.txt +++ b/build/pkgs/snowballstemmer/distros/opensuse.txt @@ -1 +1 @@ -python3-snowballstemmer +python3${PYTHON_MINOR}-snowballstemmer diff --git a/build/pkgs/snowballstemmer/spkg-configure.m4 b/build/pkgs/snowballstemmer/spkg-configure.m4 new file mode 100644 index 00000000000..6aa08825d39 --- /dev/null +++ b/build/pkgs/snowballstemmer/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([snowballstemmer], [ + SAGE_PYTHON_PACKAGE_CHECK([snowballstemmer]) +]) diff --git a/build/pkgs/soupsieve/dependencies b/build/pkgs/soupsieve/dependencies index 8cd44d06682..cfb7c484697 100644 --- a/build/pkgs/soupsieve/dependencies +++ b/build/pkgs/soupsieve/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) hatchling + | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinx/dependencies b/build/pkgs/sphinx/dependencies index 75c668d9c23..9b7505c9aec 100644 --- a/build/pkgs/sphinx/dependencies +++ b/build/pkgs/sphinx/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) docutils jinja2 pygments snowballstemmer imagesize babel alabaster requests sphinxcontrib_websupport sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml packaging importlib_metadata + | $(PYTHON_TOOLCHAIN) docutils jinja2 pygments snowballstemmer imagesize babel alabaster requests sphinxcontrib_websupport sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml packaging importlib_metadata $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinx/distros/arch.txt b/build/pkgs/sphinx/distros/arch.txt new file mode 100644 index 00000000000..db9f745da4c --- /dev/null +++ b/build/pkgs/sphinx/distros/arch.txt @@ -0,0 +1 @@ +python-sphinx diff --git a/build/pkgs/sphinx/distros/debian.txt b/build/pkgs/sphinx/distros/debian.txt new file mode 100644 index 00000000000..6966869c705 --- /dev/null +++ b/build/pkgs/sphinx/distros/debian.txt @@ -0,0 +1 @@ +sphinx diff --git a/build/pkgs/sphinx/distros/fedora.txt b/build/pkgs/sphinx/distros/fedora.txt new file mode 100644 index 00000000000..db9f745da4c --- /dev/null +++ b/build/pkgs/sphinx/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinx diff --git a/build/pkgs/sphinx/distros/freebsd.txt b/build/pkgs/sphinx/distros/freebsd.txt new file mode 100644 index 00000000000..f7f30dba25f --- /dev/null +++ b/build/pkgs/sphinx/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinx diff --git a/build/pkgs/sphinx/distros/opensuse.txt b/build/pkgs/sphinx/distros/opensuse.txt index bc54d0bd553..0aa0566b066 100644 --- a/build/pkgs/sphinx/distros/opensuse.txt +++ b/build/pkgs/sphinx/distros/opensuse.txt @@ -1 +1 @@ -python3-Sphinx +python3${PYTHON_MINOR}-Sphinx diff --git a/build/pkgs/sphinx_basic_ng/dependencies b/build/pkgs/sphinx_basic_ng/dependencies index 175a793ecbc..ac849c62bf6 100644 --- a/build/pkgs/sphinx_basic_ng/dependencies +++ b/build/pkgs/sphinx_basic_ng/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) sphinx | $(PYTHON_TOOLCHAIN) + sphinx | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinx_copybutton/dependencies b/build/pkgs/sphinx_copybutton/dependencies index 175a793ecbc..ac849c62bf6 100644 --- a/build/pkgs/sphinx_copybutton/dependencies +++ b/build/pkgs/sphinx_copybutton/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) sphinx | $(PYTHON_TOOLCHAIN) + sphinx | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_applehelp/dependencies b/build/pkgs/sphinxcontrib_applehelp/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/sphinxcontrib_applehelp/dependencies +++ b/build/pkgs/sphinxcontrib_applehelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/arch.txt b/build/pkgs/sphinxcontrib_applehelp/distros/arch.txt new file mode 100644 index 00000000000..3754baa21f5 --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/distros/arch.txt @@ -0,0 +1 @@ +python-sphinxcontrib-applehelp diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt new file mode 100644 index 00000000000..3754baa21f5 --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinxcontrib-applehelp diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt new file mode 100644 index 00000000000..73fbc3bf7ad --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinxcontrib-applehelp diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt new file mode 100644 index 00000000000..66ac8da7340 --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/sphinxcontrib-applehelp diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt index adedbd455f8..9d71e79f307 100644 --- a/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt +++ b/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt @@ -1 +1 @@ -python3-sphinxcontrib-applehelp +python3${PYTHON_MINOR}-sphinxcontrib-applehelp diff --git a/build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4 new file mode 100644 index 00000000000..e834aed8fd8 --- /dev/null +++ b/build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([sphinxcontrib_applehelp], [ + SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_applehelp]) +]) diff --git a/build/pkgs/sphinxcontrib_devhelp/dependencies b/build/pkgs/sphinxcontrib_devhelp/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/sphinxcontrib_devhelp/dependencies +++ b/build/pkgs/sphinxcontrib_devhelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/arch.txt b/build/pkgs/sphinxcontrib_devhelp/distros/arch.txt new file mode 100644 index 00000000000..0b1b3e44a6b --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/distros/arch.txt @@ -0,0 +1 @@ +python-sphinxcontrib-devhelp diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt new file mode 100644 index 00000000000..0b1b3e44a6b --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinxcontrib-devhelp diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt new file mode 100644 index 00000000000..86982bcbd27 --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinxcontrib-devhelp diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt new file mode 100644 index 00000000000..9b5c899a706 --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/sphinxcontrib-devhelp diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt new file mode 100644 index 00000000000..95012c2425d --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-sphinxcontrib-devhelp diff --git a/build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4 new file mode 100644 index 00000000000..8728136e92e --- /dev/null +++ b/build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([sphinxcontrib_devhelp], [ + SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_devhelp]) +]) diff --git a/build/pkgs/sphinxcontrib_htmlhelp/dependencies b/build/pkgs/sphinxcontrib_htmlhelp/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/sphinxcontrib_htmlhelp/dependencies +++ b/build/pkgs/sphinxcontrib_htmlhelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt new file mode 100644 index 00000000000..81390fd522f --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt @@ -0,0 +1 @@ +python-sphinxcontrib-htmlhelp diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt new file mode 100644 index 00000000000..81390fd522f --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinxcontrib-htmlhelp diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt new file mode 100644 index 00000000000..9b97c55996b --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinxcontrib-htmlhelp diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt new file mode 100644 index 00000000000..e080bacf8ba --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/sphinxcontrib-htmlhelp diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt new file mode 100644 index 00000000000..5859fe855bb --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-sphinxcontrib-htmlhelp diff --git a/build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4 new file mode 100644 index 00000000000..c77b003dc37 --- /dev/null +++ b/build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([sphinxcontrib_htmlhelp], [ + SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_htmlhelp]) +]) diff --git a/build/pkgs/sphinxcontrib_jsmath/dependencies b/build/pkgs/sphinxcontrib_jsmath/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/sphinxcontrib_jsmath/dependencies +++ b/build/pkgs/sphinxcontrib_jsmath/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/arch.txt b/build/pkgs/sphinxcontrib_jsmath/distros/arch.txt new file mode 100644 index 00000000000..2b4927832ac --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/distros/arch.txt @@ -0,0 +1 @@ +python-sphinxcontrib-jsmath diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt b/build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt new file mode 100644 index 00000000000..2b4927832ac --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinxcontrib-jsmath diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt b/build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt new file mode 100644 index 00000000000..78aa428cb13 --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinxcontrib-jsmath diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt b/build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt new file mode 100644 index 00000000000..041a4710e66 --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/sphinxcontrib-jsmath diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt b/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt new file mode 100644 index 00000000000..dbe478264db --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-sphinxcontrib-jsmath diff --git a/build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4 b/build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4 new file mode 100644 index 00000000000..e46bde2bd9d --- /dev/null +++ b/build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([sphinxcontrib_jsmath], [ + SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_jsmath]) +]) diff --git a/build/pkgs/sphinxcontrib_qthelp/dependencies b/build/pkgs/sphinxcontrib_qthelp/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/sphinxcontrib_qthelp/dependencies +++ b/build/pkgs/sphinxcontrib_qthelp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/arch.txt b/build/pkgs/sphinxcontrib_qthelp/distros/arch.txt new file mode 100644 index 00000000000..2c11924a5df --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/distros/arch.txt @@ -0,0 +1 @@ +python-sphinxcontrib-qthelp diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt new file mode 100644 index 00000000000..2c11924a5df --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinxcontrib-qthelp diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt new file mode 100644 index 00000000000..77ff8756694 --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinxcontrib-qthelp diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt new file mode 100644 index 00000000000..7210099b087 --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/sphinxcontrib-qthelp diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt new file mode 100644 index 00000000000..9462502bae5 --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-sphinxcontrib-qthelp diff --git a/build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4 new file mode 100644 index 00000000000..81ea5e1269f --- /dev/null +++ b/build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([sphinxcontrib_qthelp], [ + SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_qthelp]) +]) diff --git a/build/pkgs/sphinxcontrib_serializinghtml/dependencies b/build/pkgs/sphinxcontrib_serializinghtml/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/dependencies +++ b/build/pkgs/sphinxcontrib_serializinghtml/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt new file mode 100644 index 00000000000..46d22be403f --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt @@ -0,0 +1 @@ +python-sphinxcontrib-serializinghtml diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt new file mode 100644 index 00000000000..46d22be403f --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinxcontrib-serializinghtml diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt new file mode 100644 index 00000000000..de7f59bad6e --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinxcontrib-serializinghtml diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt new file mode 100644 index 00000000000..38bca8f1dcb --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/sphinxcontrib-serializinghtml diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt index 1a8ea8424a7..7a647e3e36a 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt +++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt @@ -1 +1 @@ -python3-sphinxcontrib-serializinghtml +python3${PYTHON_MINOR}-sphinxcontrib-serializinghtml diff --git a/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt b/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt index 98fc0654928..584fc77c6b2 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt +++ b/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt @@ -1 +1 @@ -sphinxcontrib_serializinghtml >=1.1.4 +sphinxcontrib_serializinghtml >=1.1.5 diff --git a/build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4 b/build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4 new file mode 100644 index 00000000000..be8e62555ac --- /dev/null +++ b/build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([sphinxcontrib_serializinghtml], [ + SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_serializinghtml]) +]) diff --git a/build/pkgs/sphinxcontrib_websupport/dependencies b/build/pkgs/sphinxcontrib_websupport/dependencies index dabbd0f750d..52be4a5ba53 100644 --- a/build/pkgs/sphinxcontrib_websupport/dependencies +++ b/build/pkgs/sphinxcontrib_websupport/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) sphinxcontrib_serializinghtml | $(PYTHON_TOOLCHAIN) + sphinxcontrib_serializinghtml | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinxcontrib_websupport/distros/arch.txt b/build/pkgs/sphinxcontrib_websupport/distros/arch.txt new file mode 100644 index 00000000000..a9a5a1a1727 --- /dev/null +++ b/build/pkgs/sphinxcontrib_websupport/distros/arch.txt @@ -0,0 +1 @@ +python-sphinxcontrib-websupport diff --git a/build/pkgs/sphinxcontrib_websupport/distros/fedora.txt b/build/pkgs/sphinxcontrib_websupport/distros/fedora.txt new file mode 100644 index 00000000000..a9a5a1a1727 --- /dev/null +++ b/build/pkgs/sphinxcontrib_websupport/distros/fedora.txt @@ -0,0 +1 @@ +python-sphinxcontrib-websupport diff --git a/build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt b/build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt new file mode 100644 index 00000000000..b8911943237 --- /dev/null +++ b/build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt @@ -0,0 +1 @@ +textproc/py-sphinxcontrib-websupport diff --git a/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt b/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt index 2c8e8e8d34d..d01c76bd534 100644 --- a/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt +++ b/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt @@ -1 +1 @@ -python3-sphinxcontrib-websupport +python3${PYTHON_MINOR}-sphinxcontrib-websupport diff --git a/build/pkgs/sqlalchemy/distros/opensuse.txt b/build/pkgs/sqlalchemy/distros/opensuse.txt index 023e06b7468..0a1757fd5b3 100644 --- a/build/pkgs/sqlalchemy/distros/opensuse.txt +++ b/build/pkgs/sqlalchemy/distros/opensuse.txt @@ -1 +1 @@ -python3-SQLAlchemy +python3${PYTHON_MINOR}-SQLAlchemy diff --git a/build/pkgs/stack_data/dependencies b/build/pkgs/stack_data/dependencies index cf6aae43990..52b3edda4b5 100644 --- a/build/pkgs/stack_data/dependencies +++ b/build/pkgs/stack_data/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) executing asttokens pure_eval | $(PYTHON_TOOLCHAIN) + executing asttokens pure_eval | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/surface_dynamics/dependencies b/build/pkgs/surface_dynamics/dependencies index 936121d388d..d8bc8524dbb 100644 --- a/build/pkgs/surface_dynamics/dependencies +++ b/build/pkgs/surface_dynamics/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) cysignals pplpy $(SAGE_SRC)/sage/rings/integer.pxd $(SAGE_SRC)/sage/ext/stdsage.pxd | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) + cysignals pplpy $(SAGE_SRC)/sage/rings/integer.pxd $(SAGE_SRC)/sage/ext/stdsage.pxd | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/symengine_py/dependencies b/build/pkgs/symengine_py/dependencies index 0b94df79ab9..c48bcedf69c 100644 --- a/build/pkgs/symengine_py/dependencies +++ b/build/pkgs/symengine_py/dependencies @@ -1,4 +1,4 @@ -symengine $(PYTHON) | cmake cython $(PYTHON_TOOLCHAIN) +symengine | cmake cython $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sympy/dependencies b/build/pkgs/sympy/dependencies index 24e1585f16e..6480ac46289 100644 --- a/build/pkgs/sympy/dependencies +++ b/build/pkgs/sympy/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) mpmath | $(PYTHON_TOOLCHAIN) + mpmath | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sympy/distros/arch.txt b/build/pkgs/sympy/distros/arch.txt new file mode 100644 index 00000000000..126c88afd85 --- /dev/null +++ b/build/pkgs/sympy/distros/arch.txt @@ -0,0 +1 @@ +python-sympy diff --git a/build/pkgs/sympy/distros/debian.txt b/build/pkgs/sympy/distros/debian.txt new file mode 100644 index 00000000000..db423c87ba7 --- /dev/null +++ b/build/pkgs/sympy/distros/debian.txt @@ -0,0 +1 @@ +python3-sympy diff --git a/build/pkgs/sympy/distros/fedora.txt b/build/pkgs/sympy/distros/fedora.txt new file mode 100644 index 00000000000..126c88afd85 --- /dev/null +++ b/build/pkgs/sympy/distros/fedora.txt @@ -0,0 +1 @@ +python-sympy diff --git a/build/pkgs/sympy/distros/gentoo.txt b/build/pkgs/sympy/distros/gentoo.txt new file mode 100644 index 00000000000..b5a5034c731 --- /dev/null +++ b/build/pkgs/sympy/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/sympy diff --git a/build/pkgs/sympy/distros/opensuse.txt b/build/pkgs/sympy/distros/opensuse.txt new file mode 100644 index 00000000000..bea17da35b4 --- /dev/null +++ b/build/pkgs/sympy/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-sympy diff --git a/build/pkgs/sympy/spkg-configure.m4 b/build/pkgs/sympy/spkg-configure.m4 new file mode 100644 index 00000000000..fa0f1f54311 --- /dev/null +++ b/build/pkgs/sympy/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([sympy], [SAGE_PYTHON_PACKAGE_CHECK([sympy])]) diff --git a/build/pkgs/terminado/dependencies b/build/pkgs/terminado/dependencies index 54ec1c7c229..2138b7ccbe8 100644 --- a/build/pkgs/terminado/dependencies +++ b/build/pkgs/terminado/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) ptyprocess tornado | $(PYTHON_TOOLCHAIN) hatchling + ptyprocess tornado | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/terminado/distros/gentoo.txt b/build/pkgs/terminado/distros/gentoo.txt new file mode 100644 index 00000000000..1df16f18abb --- /dev/null +++ b/build/pkgs/terminado/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/terminado diff --git a/build/pkgs/terminado/spkg-configure.m4 b/build/pkgs/terminado/spkg-configure.m4 new file mode 100644 index 00000000000..5defc2ff877 --- /dev/null +++ b/build/pkgs/terminado/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([terminado], [SAGE_PYTHON_PACKAGE_CHECK([terminado])]) diff --git a/build/pkgs/texttable/dependencies b/build/pkgs/texttable/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/texttable/dependencies +++ b/build/pkgs/texttable/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/texttable/distros/arch.txt b/build/pkgs/texttable/distros/arch.txt new file mode 100644 index 00000000000..8d1ccec8c7d --- /dev/null +++ b/build/pkgs/texttable/distros/arch.txt @@ -0,0 +1 @@ +python-texttable diff --git a/build/pkgs/texttable/distros/debian.txt b/build/pkgs/texttable/distros/debian.txt new file mode 100644 index 00000000000..8f8e7e29d7a --- /dev/null +++ b/build/pkgs/texttable/distros/debian.txt @@ -0,0 +1 @@ +python3-texttable diff --git a/build/pkgs/texttable/distros/fedora.txt b/build/pkgs/texttable/distros/fedora.txt new file mode 100644 index 00000000000..8d1ccec8c7d --- /dev/null +++ b/build/pkgs/texttable/distros/fedora.txt @@ -0,0 +1 @@ +python-texttable diff --git a/build/pkgs/texttable/distros/gentoo.txt b/build/pkgs/texttable/distros/gentoo.txt new file mode 100644 index 00000000000..b33a7a75d50 --- /dev/null +++ b/build/pkgs/texttable/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/texttable diff --git a/build/pkgs/texttable/distros/opensuse.txt b/build/pkgs/texttable/distros/opensuse.txt new file mode 100644 index 00000000000..d4959328e94 --- /dev/null +++ b/build/pkgs/texttable/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-texttable diff --git a/build/pkgs/texttable/spkg-configure.m4 b/build/pkgs/texttable/spkg-configure.m4 new file mode 100644 index 00000000000..42a3de105b5 --- /dev/null +++ b/build/pkgs/texttable/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([texttable], [SAGE_PYTHON_PACKAGE_CHECK([texttable])]) diff --git a/build/pkgs/tinycss2/dependencies b/build/pkgs/tinycss2/dependencies index 89200065387..7ebee8487db 100644 --- a/build/pkgs/tinycss2/dependencies +++ b/build/pkgs/tinycss2/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) webencodings | $(PYTHON_TOOLCHAIN) + webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/toml/dependencies b/build/pkgs/toml/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/toml/dependencies +++ b/build/pkgs/toml/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/toml/distros/arch.txt b/build/pkgs/toml/distros/arch.txt new file mode 100644 index 00000000000..821ee775ac7 --- /dev/null +++ b/build/pkgs/toml/distros/arch.txt @@ -0,0 +1 @@ +python-toml diff --git a/build/pkgs/toml/distros/debian.txt b/build/pkgs/toml/distros/debian.txt new file mode 100644 index 00000000000..543e89d2a6f --- /dev/null +++ b/build/pkgs/toml/distros/debian.txt @@ -0,0 +1 @@ +python3-toml diff --git a/build/pkgs/toml/distros/fedora.txt b/build/pkgs/toml/distros/fedora.txt new file mode 100644 index 00000000000..821ee775ac7 --- /dev/null +++ b/build/pkgs/toml/distros/fedora.txt @@ -0,0 +1 @@ +python-toml diff --git a/build/pkgs/toml/distros/gentoo.txt b/build/pkgs/toml/distros/gentoo.txt new file mode 100644 index 00000000000..64fcea3559f --- /dev/null +++ b/build/pkgs/toml/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/toml diff --git a/build/pkgs/toml/distros/opensuse.txt b/build/pkgs/toml/distros/opensuse.txt new file mode 100644 index 00000000000..fbc340aee15 --- /dev/null +++ b/build/pkgs/toml/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-toml diff --git a/build/pkgs/tomli/dependencies b/build/pkgs/tomli/dependencies index 7cd1e28759d..992761d1f11 100644 --- a/build/pkgs/tomli/dependencies +++ b/build/pkgs/tomli/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | pip flit_core + | pip flit_core $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/tomli/distros/gentoo.txt b/build/pkgs/tomli/distros/gentoo.txt new file mode 100644 index 00000000000..0458e252a4d --- /dev/null +++ b/build/pkgs/tomli/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/tomli diff --git a/build/pkgs/tomli/spkg-configure.m4 b/build/pkgs/tomli/spkg-configure.m4 new file mode 100644 index 00000000000..95a8b8b84c2 --- /dev/null +++ b/build/pkgs/tomli/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([tomli], [SAGE_PYTHON_PACKAGE_CHECK([tomli])]) diff --git a/build/pkgs/tomlkit/dependencies b/build/pkgs/tomlkit/dependencies index 3eb5a92ef22..e67b4c08948 100644 --- a/build/pkgs/tomlkit/dependencies +++ b/build/pkgs/tomlkit/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) poetry_core + | $(PYTHON_TOOLCHAIN) poetry_core $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/tornado/dependencies b/build/pkgs/tornado/dependencies index 212c6234efb..0d4701f9d71 100644 --- a/build/pkgs/tornado/dependencies +++ b/build/pkgs/tornado/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) certifi | $(PYTHON_TOOLCHAIN) + certifi | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/tornado/distros/gentoo.txt b/build/pkgs/tornado/distros/gentoo.txt new file mode 100644 index 00000000000..6ae4b9fc443 --- /dev/null +++ b/build/pkgs/tornado/distros/gentoo.txt @@ -0,0 +1 @@ +www-servers/tornado diff --git a/build/pkgs/tornado/distros/opensuse.txt b/build/pkgs/tornado/distros/opensuse.txt index 426685be95b..1f37b341221 100644 --- a/build/pkgs/tornado/distros/opensuse.txt +++ b/build/pkgs/tornado/distros/opensuse.txt @@ -1 +1 @@ -python3-tornado +python3${PYTHON_MINOR}-tornado diff --git a/build/pkgs/tornado/spkg-configure.m4 b/build/pkgs/tornado/spkg-configure.m4 new file mode 100644 index 00000000000..1ee5bc9f544 --- /dev/null +++ b/build/pkgs/tornado/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([tornado], [SAGE_PYTHON_PACKAGE_CHECK([tornado])]) diff --git a/build/pkgs/tox/dependencies b/build/pkgs/tox/dependencies index 5a00a282b7d..d910d42722f 100644 --- a/build/pkgs/tox/dependencies +++ b/build/pkgs/tox/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) packaging six filelock pluggy py toml virtualenv importlib_metadata | $(PYTHON_TOOLCHAIN) + packaging six filelock pluggy py toml virtualenv importlib_metadata | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/traitlets/dependencies b/build/pkgs/traitlets/dependencies index df88de8f64c..e835448bea5 100644 --- a/build/pkgs/traitlets/dependencies +++ b/build/pkgs/traitlets/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) ipython_genutils decorator six hatchling + | $(PYTHON_TOOLCHAIN) ipython_genutils decorator six hatchling $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/traitlets/distros/gentoo.txt b/build/pkgs/traitlets/distros/gentoo.txt new file mode 100644 index 00000000000..46bfaab6fef --- /dev/null +++ b/build/pkgs/traitlets/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/traitlets diff --git a/build/pkgs/traitlets/distros/opensuse.txt b/build/pkgs/traitlets/distros/opensuse.txt index 93cb8375e46..f0cc6730e1f 100644 --- a/build/pkgs/traitlets/distros/opensuse.txt +++ b/build/pkgs/traitlets/distros/opensuse.txt @@ -1 +1 @@ -python3-traitlets +python3${PYTHON_MINOR}-traitlets diff --git a/build/pkgs/traitlets/spkg-configure.m4 b/build/pkgs/traitlets/spkg-configure.m4 new file mode 100644 index 00000000000..df2382b8f01 --- /dev/null +++ b/build/pkgs/traitlets/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([traitlets], [SAGE_PYTHON_PACKAGE_CHECK([traitlets])]) diff --git a/build/pkgs/typing_extensions/dependencies b/build/pkgs/typing_extensions/dependencies index f8bd1ee040d..e0e94942dba 100644 --- a/build/pkgs/typing_extensions/dependencies +++ b/build/pkgs/typing_extensions/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | flit_core + | flit_core $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/typing_extensions/distros/arch.txt b/build/pkgs/typing_extensions/distros/arch.txt new file mode 100644 index 00000000000..92ad68dabc4 --- /dev/null +++ b/build/pkgs/typing_extensions/distros/arch.txt @@ -0,0 +1 @@ +python-typing_extensions diff --git a/build/pkgs/typing_extensions/distros/debian.txt b/build/pkgs/typing_extensions/distros/debian.txt new file mode 100644 index 00000000000..424ebf1a645 --- /dev/null +++ b/build/pkgs/typing_extensions/distros/debian.txt @@ -0,0 +1 @@ +python3-typing-extensions diff --git a/build/pkgs/typing_extensions/distros/fedora.txt b/build/pkgs/typing_extensions/distros/fedora.txt new file mode 100644 index 00000000000..8c13a4539ac --- /dev/null +++ b/build/pkgs/typing_extensions/distros/fedora.txt @@ -0,0 +1 @@ +python-typing-extensions diff --git a/build/pkgs/typing_extensions/distros/freebsd.txt b/build/pkgs/typing_extensions/distros/freebsd.txt new file mode 100644 index 00000000000..b4424d384df --- /dev/null +++ b/build/pkgs/typing_extensions/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-typing-extensions diff --git a/build/pkgs/typing_extensions/distros/gentoo.txt b/build/pkgs/typing_extensions/distros/gentoo.txt new file mode 100644 index 00000000000..20b3d1de123 --- /dev/null +++ b/build/pkgs/typing_extensions/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/typing-extensions diff --git a/build/pkgs/typing_extensions/distros/opensuse.txt b/build/pkgs/typing_extensions/distros/opensuse.txt new file mode 100644 index 00000000000..62a10cbbc72 --- /dev/null +++ b/build/pkgs/typing_extensions/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-typing_extensions diff --git a/build/pkgs/tzdata/dependencies b/build/pkgs/tzdata/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/tzdata/dependencies +++ b/build/pkgs/tzdata/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/tzlocal/dependencies b/build/pkgs/tzlocal/dependencies index 1d3b818d4ac..4e161b299ab 100644 --- a/build/pkgs/tzlocal/dependencies +++ b/build/pkgs/tzlocal/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) pytz_deprecation_shim | $(PYTHON_TOOLCHAIN) + pytz_deprecation_shim | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/tzlocal/distros/arch.txt b/build/pkgs/tzlocal/distros/arch.txt new file mode 100644 index 00000000000..1de39af60b2 --- /dev/null +++ b/build/pkgs/tzlocal/distros/arch.txt @@ -0,0 +1 @@ +python-tzlocal diff --git a/build/pkgs/tzlocal/distros/debian.txt b/build/pkgs/tzlocal/distros/debian.txt new file mode 100644 index 00000000000..95d2d705c05 --- /dev/null +++ b/build/pkgs/tzlocal/distros/debian.txt @@ -0,0 +1 @@ +python3-tzlocal diff --git a/build/pkgs/tzlocal/distros/fedora.txt b/build/pkgs/tzlocal/distros/fedora.txt new file mode 100644 index 00000000000..1de39af60b2 --- /dev/null +++ b/build/pkgs/tzlocal/distros/fedora.txt @@ -0,0 +1 @@ +python-tzlocal diff --git a/build/pkgs/tzlocal/distros/freebsd.txt b/build/pkgs/tzlocal/distros/freebsd.txt new file mode 100644 index 00000000000..c42ec397d1c --- /dev/null +++ b/build/pkgs/tzlocal/distros/freebsd.txt @@ -0,0 +1 @@ +devel/py-tzlocal diff --git a/build/pkgs/tzlocal/distros/gentoo.txt b/build/pkgs/tzlocal/distros/gentoo.txt new file mode 100644 index 00000000000..2018442dcc4 --- /dev/null +++ b/build/pkgs/tzlocal/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/tzlocal diff --git a/build/pkgs/tzlocal/distros/opensuse.txt b/build/pkgs/tzlocal/distros/opensuse.txt index 95d2d705c05..2e4de5e9e49 100644 --- a/build/pkgs/tzlocal/distros/opensuse.txt +++ b/build/pkgs/tzlocal/distros/opensuse.txt @@ -1 +1 @@ -python3-tzlocal +python3${PYTHON_MINOR}-tzlocal diff --git a/build/pkgs/tzlocal/spkg-configure.m4 b/build/pkgs/tzlocal/spkg-configure.m4 new file mode 100644 index 00000000000..e020b2823f9 --- /dev/null +++ b/build/pkgs/tzlocal/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([tzlocal], [SAGE_PYTHON_PACKAGE_CHECK([tzlocal])]) diff --git a/build/pkgs/urllib3/dependencies b/build/pkgs/urllib3/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/urllib3/dependencies +++ b/build/pkgs/urllib3/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/urllib3/distros/arch.txt b/build/pkgs/urllib3/distros/arch.txt new file mode 100644 index 00000000000..af6e58664fb --- /dev/null +++ b/build/pkgs/urllib3/distros/arch.txt @@ -0,0 +1 @@ +python-urllib3 diff --git a/build/pkgs/urllib3/distros/debian.txt b/build/pkgs/urllib3/distros/debian.txt new file mode 100644 index 00000000000..918569f9677 --- /dev/null +++ b/build/pkgs/urllib3/distros/debian.txt @@ -0,0 +1 @@ +python3-urllib3 diff --git a/build/pkgs/urllib3/distros/fedora.txt b/build/pkgs/urllib3/distros/fedora.txt new file mode 100644 index 00000000000..af6e58664fb --- /dev/null +++ b/build/pkgs/urllib3/distros/fedora.txt @@ -0,0 +1 @@ +python-urllib3 diff --git a/build/pkgs/urllib3/distros/freebsd.txt b/build/pkgs/urllib3/distros/freebsd.txt new file mode 100644 index 00000000000..751c1d25c41 --- /dev/null +++ b/build/pkgs/urllib3/distros/freebsd.txt @@ -0,0 +1 @@ +net/py-urllib3 diff --git a/build/pkgs/urllib3/distros/gentoo.txt b/build/pkgs/urllib3/distros/gentoo.txt new file mode 100644 index 00000000000..172a5357dba --- /dev/null +++ b/build/pkgs/urllib3/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/urllib3 diff --git a/build/pkgs/urllib3/distros/opensuse.txt b/build/pkgs/urllib3/distros/opensuse.txt new file mode 100644 index 00000000000..7466e3c2bdd --- /dev/null +++ b/build/pkgs/urllib3/distros/opensuse.txt @@ -0,0 +1 @@ +python3${PYTHON_MINOR}-urllib3 diff --git a/build/pkgs/urllib3/spkg-configure.m4 b/build/pkgs/urllib3/spkg-configure.m4 new file mode 100644 index 00000000000..d7ef3e1661c --- /dev/null +++ b/build/pkgs/urllib3/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([urllib3], [SAGE_PYTHON_PACKAGE_CHECK([urllib3])]) diff --git a/build/pkgs/vcversioner/dependencies b/build/pkgs/vcversioner/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/vcversioner/dependencies +++ b/build/pkgs/vcversioner/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/vcversioner/distros/opensuse.txt b/build/pkgs/vcversioner/distros/opensuse.txt index 3a9b9818aa4..a9b307f8509 100644 --- a/build/pkgs/vcversioner/distros/opensuse.txt +++ b/build/pkgs/vcversioner/distros/opensuse.txt @@ -1 +1 @@ -python3-vcversioner +python3${PYTHON_MINOR}-vcversioner diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies index a8b8def7051..021e0fc1bd7 100644 --- a/build/pkgs/virtualenv/dependencies +++ b/build/pkgs/virtualenv/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) appdirs distlib filelock six importlib_metadata importlib_resources platformdirs | $(PYTHON_TOOLCHAIN) + appdirs distlib filelock six importlib_metadata importlib_resources platformdirs | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/wcwidth/dependencies b/build/pkgs/wcwidth/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/wcwidth/dependencies +++ b/build/pkgs/wcwidth/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/wcwidth/distros/gentoo.txt b/build/pkgs/wcwidth/distros/gentoo.txt new file mode 100644 index 00000000000..edeb80b62a1 --- /dev/null +++ b/build/pkgs/wcwidth/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/wcwidth diff --git a/build/pkgs/wcwidth/distros/opensuse.txt b/build/pkgs/wcwidth/distros/opensuse.txt index 2974220c878..8fea03a6c67 100644 --- a/build/pkgs/wcwidth/distros/opensuse.txt +++ b/build/pkgs/wcwidth/distros/opensuse.txt @@ -1 +1 @@ -python3-wcwidth +python3${PYTHON_MINOR}-wcwidth diff --git a/build/pkgs/wcwidth/spkg-configure.m4 b/build/pkgs/wcwidth/spkg-configure.m4 new file mode 100644 index 00000000000..5bde15af224 --- /dev/null +++ b/build/pkgs/wcwidth/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([wcwidth], [SAGE_PYTHON_PACKAGE_CHECK([wcwidth])]) diff --git a/build/pkgs/webencodings/dependencies b/build/pkgs/webencodings/dependencies index 0738c2d7777..47296a7bace 100644 --- a/build/pkgs/webencodings/dependencies +++ b/build/pkgs/webencodings/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) + | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/webencodings/distros/arch.txt b/build/pkgs/webencodings/distros/arch.txt new file mode 100644 index 00000000000..12ddba901a4 --- /dev/null +++ b/build/pkgs/webencodings/distros/arch.txt @@ -0,0 +1 @@ +python-webencodings diff --git a/build/pkgs/webencodings/distros/debian.txt b/build/pkgs/webencodings/distros/debian.txt new file mode 100644 index 00000000000..ac30c2f3307 --- /dev/null +++ b/build/pkgs/webencodings/distros/debian.txt @@ -0,0 +1 @@ +python3-webencodings diff --git a/build/pkgs/webencodings/distros/fedora.txt b/build/pkgs/webencodings/distros/fedora.txt new file mode 100644 index 00000000000..12ddba901a4 --- /dev/null +++ b/build/pkgs/webencodings/distros/fedora.txt @@ -0,0 +1 @@ +python-webencodings diff --git a/build/pkgs/webencodings/distros/gentoo.txt b/build/pkgs/webencodings/distros/gentoo.txt new file mode 100644 index 00000000000..7539b0fdcde --- /dev/null +++ b/build/pkgs/webencodings/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/webencodings diff --git a/build/pkgs/webencodings/distros/opensuse.txt b/build/pkgs/webencodings/distros/opensuse.txt index ac30c2f3307..b8d9c4d299c 100644 --- a/build/pkgs/webencodings/distros/opensuse.txt +++ b/build/pkgs/webencodings/distros/opensuse.txt @@ -1 +1 @@ -python3-webencodings +python3${PYTHON_MINOR}-webencodings diff --git a/build/pkgs/webencodings/spkg-configure.m4 b/build/pkgs/webencodings/spkg-configure.m4 new file mode 100644 index 00000000000..1b9a5c431f3 --- /dev/null +++ b/build/pkgs/webencodings/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([webencodings], [ + SAGE_PYTHON_PACKAGE_CHECK([webencodings]) +]) diff --git a/build/pkgs/wheel/dependencies b/build/pkgs/wheel/dependencies index 98d3e59447b..a8e327be793 100644 --- a/build/pkgs/wheel/dependencies +++ b/build/pkgs/wheel/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) setuptools + setuptools | $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/wheel/distros/arch.txt b/build/pkgs/wheel/distros/arch.txt new file mode 100644 index 00000000000..ae4cbb9f52f --- /dev/null +++ b/build/pkgs/wheel/distros/arch.txt @@ -0,0 +1 @@ +python-wheel diff --git a/build/pkgs/wheel/distros/debian.txt b/build/pkgs/wheel/distros/debian.txt new file mode 100644 index 00000000000..3c066725a1d --- /dev/null +++ b/build/pkgs/wheel/distros/debian.txt @@ -0,0 +1 @@ +python3-wheel diff --git a/build/pkgs/wheel/distros/fedora.txt b/build/pkgs/wheel/distros/fedora.txt new file mode 100644 index 00000000000..ae4cbb9f52f --- /dev/null +++ b/build/pkgs/wheel/distros/fedora.txt @@ -0,0 +1 @@ +python-wheel diff --git a/build/pkgs/wheel/distros/gentoo.txt b/build/pkgs/wheel/distros/gentoo.txt new file mode 100644 index 00000000000..ec571d59d93 --- /dev/null +++ b/build/pkgs/wheel/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/wheel diff --git a/build/pkgs/wheel/distros/opensuse.txt b/build/pkgs/wheel/distros/opensuse.txt index 3c066725a1d..3df335c1375 100644 --- a/build/pkgs/wheel/distros/opensuse.txt +++ b/build/pkgs/wheel/distros/opensuse.txt @@ -1 +1 @@ -python3-wheel +python3${PYTHON_MINOR}-wheel diff --git a/build/pkgs/wheel/spkg-configure.m4 b/build/pkgs/wheel/spkg-configure.m4 new file mode 100644 index 00000000000..7897ea96cc6 --- /dev/null +++ b/build/pkgs/wheel/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([wheel], [SAGE_PYTHON_PACKAGE_CHECK([wheel])]) diff --git a/build/pkgs/widgetsnbextension/dependencies b/build/pkgs/widgetsnbextension/dependencies index f7ff1dca568..301cefdea49 100644 --- a/build/pkgs/widgetsnbextension/dependencies +++ b/build/pkgs/widgetsnbextension/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) jupyter_packaging | $(PYTHON_TOOLCHAIN) jupyter_core + jupyter_packaging | $(PYTHON_TOOLCHAIN) jupyter_core $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/widgetsnbextension/spkg-configure.m4 b/build/pkgs/widgetsnbextension/spkg-configure.m4 new file mode 100644 index 00000000000..bf82dafe209 --- /dev/null +++ b/build/pkgs/widgetsnbextension/spkg-configure.m4 @@ -0,0 +1,3 @@ +SAGE_SPKG_CONFIGURE([widgetsnbextension], [ + SAGE_PYTHON_PACKAGE_CHECK([widgetsnbextension]) +]) diff --git a/build/pkgs/zipp/dependencies b/build/pkgs/zipp/dependencies index 4361e46ddaf..9be6b4aab7c 100644 --- a/build/pkgs/zipp/dependencies +++ b/build/pkgs/zipp/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) vcversioner | $(PYTHON_TOOLCHAIN) + vcversioner | $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/zipp/distros/gentoo.txt b/build/pkgs/zipp/distros/gentoo.txt new file mode 100644 index 00000000000..7f59450c2b7 --- /dev/null +++ b/build/pkgs/zipp/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/zipp diff --git a/build/pkgs/zipp/spkg-configure.m4 b/build/pkgs/zipp/spkg-configure.m4 new file mode 100644 index 00000000000..0fe3a9cd224 --- /dev/null +++ b/build/pkgs/zipp/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([zipp], [SAGE_PYTHON_PACKAGE_CHECK([zipp])]) diff --git a/configure.ac b/configure.ac index 4a255967fc6..26515d45839 100644 --- a/configure.ac +++ b/configure.ac @@ -445,6 +445,40 @@ AC_ARG_ENABLE([download-from-upstream-url], [disallow downloading packages from their upstream URL if they cannot be found on the Sage mirrors])], [], [AS_VAR_SET([enable_download_from_upstream_url], [yes])]) +AC_ARG_ENABLE( + [system-site-packages], [AS_HELP_STRING( + [--enable-system-site-packages], + [allow the use of python packages from the system (experimental; default: no)] + )], [ + AS_IF([test "x$enable_system_site_packages" = "xyes"], [ + dnl When installing python SPKGs in the presence of system-site + dnl packages, we need to --ignore-installed so that a patched SPKG + dnl can be installed in the presence of an unpatched system package + dnl that appears (to pip) to be identical. The --no-deps flag is + dnl then needed because --ignore-installed will make any installed + dnl dependencies invisible to pip, who does not appreciate that. + SAGE_PIP_INSTALL_FLAGS="${SAGE_PIP_INSTALL_FLAGS} --no-deps --ignore-installed" + + SAGE_VENV_FLAGS="${SAGE_VENV_FLAGS} --system-site-packages" + + dnl We want to raise an error if the user asked for "system site + dnl packages" but the system python will not be used. Technically + dnl that causes no problems (SAGE_PYTHON_PACKAGE_CHECK always fails, + dnl so SPKGs are used for all python packages), but it may be confusing + dnl to end users who expect the flag to actually give them access to + dnl their system python packages and who may not be paying close + dnl attention to their ./configure output. + with_system_python3="force" + + dnl This is substituted in to build/bin/sage-build-env-config.in for use + dnl by build/bin/sage-get-system-packages + ENABLE_SYSTEM_SITE_PACKAGES=yes + ]) +]) +AC_SUBST([ENABLE_SYSTEM_SITE_PACKAGES]) +AC_SUBST([SAGE_PIP_INSTALL_FLAGS]) +AC_SUBST([SAGE_VENV_FLAGS]) + SAGE_SPKG_OPTIONS="" AS_IF([test "x$enable_experimental_packages" = "xyes"], [ AS_VAR_APPEND([SAGE_SPKG_OPTIONS], [" -y"]) diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4 new file mode 100644 index 00000000000..e0713512ea0 --- /dev/null +++ b/m4/sage_python_package_check.m4 @@ -0,0 +1,118 @@ +# +# SYNOPSIS +# +# SAGE_PYTHON_PACKAGE_CHECK(package) +# +# DESCRIPTION +# +# Determine if the system copy of a python package can be used by sage. +# +# This macro uses setuptools.version's pkg_resources to check that the +# "install-requires.txt" file for the named package is satisfied, and +# it can typically fail in four ways: +# +# 1. If --enable-system-site-packages was not passed to ./configure, +# +# 2. If we are not using the system python (no $PYTHON_FOR_VENV), +# +# 3. If we are unable to create a venv with the system python, +# +# 4. If setuptools is not available to the system python, +# +# 5. If the contents of install-requires.txt are not met (wrong +# version, no version, etc.) by the system python. +# +# In any of those cases, we set sage_spkg_install_$package to "yes" +# so that the corresponding SPKG is installed. Otherwise, we do +# nothing, since the default value of sage_spkg_install_$package +# is "no" (to use the system copy). +# +# The SAGE_SPKG_CONFIGURE_PYTHON3() macro is AC_REQUIRE'd to ensure +# that $PYTHON_FOR_VENV is available, if it is going to be available. +# The check is run inside a new venv, and with the PYTHONUSERBASE +# variable poisoned in the same manner as sage-env poisons it, to +# ensure that the ./configure- and run-time views of the system +# are as similar as possible. +# +# To avoid suggesting these system packages to users who have not +# set --enable-system-site-packages, this macro also changes the +# default for --with-system-foo from "yes" to "no" in that case. +# + +AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [ + AC_MSG_CHECKING([if --enable-system-site-packages was used]) + AS_IF([test "${enable_system_site_packages}" = "yes"], [ + AC_MSG_RESULT(yes) + AC_REQUIRE([SAGE_SPKG_CONFIGURE_PYTHON3]) + + dnl We run this check inside a python venv, because that's ultimately + dnl how the system $PYTHON_FOR_VENV will be used. + AC_MSG_CHECKING([if we can create a python venv in config.venv]) + + dnl Use --clear because ./configure typically clobbers its output files. + AS_IF(["${PYTHON_FOR_VENV}" build/bin/sage-venv dnl + --system-site-packages dnl + --clear dnl + config.venv dnl + 2>&AS_MESSAGE_LOG_FD], [ + AC_MSG_RESULT(yes) + dnl strip all comments from install-requires.txt; this should leave + dnl only a single line containing the version specification for this + dnl package. + SAGE_PKG_VERSPEC=$(sed '/^#/d' "./build/pkgs/$1/install-requires.txt") + AC_MSG_CHECKING([for python package $1 ("${SAGE_PKG_VERSPEC}")]) + + dnl To prevent user-site (pip install --user) packages from being + dnl detected as "system" packages, we poison PYTHONUSERBASE. The + dnl sage-env script also does this at runtime; we mimic that + dnl implementation to ensure that the behaviors at ./configure and + dnl runtime are identical. Beware that (as in sage-env) the poisoning + dnl is skipped if PYTHONUSERBASE is non-empty. In particular, if the + dnl user points PYTHONUSERBASE to any path (even the default), then + dnl his local pip packages will be detected. + PYTHONUSERBASE_SAVED="${PYTHONUSERBASE}" + AS_IF([test -z "${PYTHONUSERBASE}"], [ + PYTHONUSERBASE="${HOME}/.sage/local" + ]) + + AS_IF( + [PYTHONUSERBASE="${PYTHONUSERBASE}" config.venv/bin/python3 -c dnl + "import pkg_resources; dnl + pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())" dnl + 2>&AS_MESSAGE_LOG_FD], + [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no); sage_spkg_install_$1=yes] + ) + + PYTHONUSERBASE="${PYTHONUSERBASE_SAVED}" + ], [ + dnl failed to create a venv for some reason + AC_MSG_RESULT(no) + sage_spkg_install_$1=yes + ]) + + dnl Clean up config.venv, but only if we could have created it. + dnl (The --clear flag to pyvenv will not clobber a plain file.) + AS_IF([test -d config.venv], [rm -rf config.venv]) + ], [ + dnl System site packages are disabled. + AC_MSG_RESULT(no; skipping check) + sage_spkg_install_$1=yes + + dnl We have to retroactively hack the --with-system-foo={no,yes,force} + dnl mechanism here because it wasn't designed with the ability to + dnl disable arbitrary chunks of system packages in mind. The easy cases + dnl are "no" and "force" which require no action; "no" means we won't + dnl suggest the package anyway, and "force" will raise an error when + dnl the system-package check fails. + dnl + dnl The default of "yes" is more troubling because it is the default. To + dnl avoid prompting users to install packages that won't be used, we want + dnl to ignore "yes" when reporting the "hint: install these packages..." + dnl at the end of ./configure. To accomplish that, we change "yes" to + dnl "no" here, essentially changing the default for packages using this + dnl macro when --enable-system-site-packages is disabled. Packages with + dnl "no" are not suggested to the user. + AS_IF([test "${sage_use_system_$1}" = "yes"],[sage_use_system_$1=no]) + ]) +]) diff --git a/m4/sage_spkg_configure.m4 b/m4/sage_spkg_configure.m4 index a0eeaa53a74..1f07d7cd294 100644 --- a/m4/sage_spkg_configure.m4 +++ b/m4/sage_spkg_configure.m4 @@ -58,6 +58,31 @@ dnl indicate why m4_pushdef([SPKG_USE_SYSTEM], [sage_use_system_]SPKG_NAME) # BEGIN SAGE_SPKG_CONFIGURE_]m4_toupper($1)[ +dnl Hide the output from Python (system site package) checks +dnl when --enable-system-site-packages was not given. This +dnl doesn't affect the test results but it minimizes the noise +dnl in the ./configure output. The config.log however retains +dnl everything. +dnl +dnl Open descriptor 9 as a copy of AS_MESSAGE_FD, so that it +dnl can later be used to restore AS_MESSAGE_FD. Afterwards, +dnl send AS_MESSAGE_FD to /dev/null. We'll restore it if this +dnl isn't a python package or if --enable-system-site-packages +dnl was given (or at the end of this macro, if nothing else). +exec 9<&AS_MESSAGE_FD +exec AS_MESSAGE_FD>/dev/null + +AS_IF([test "${enable_system_site_packages}" = "yes"], [ + dnl Python package checks are enabled, so restore AS_MESSAGE_FD + exec AS_MESSAGE_FD<&9 +]) + +SPKG_CONFIGURE="${SAGE_ROOT}/build/pkgs/$1/spkg-configure.m4" +AS_IF([! grep -q [SAGE_PYTHON_PACKAGE_CHECK] "${SPKG_CONFIGURE}"],[ + dnl Not a python package, so restore AS_MESSAGE_FD + exec AS_MESSAGE_FD<&9 +]) + echo "-----------------------------------------------------------------------------" >& AS_MESSAGE_FD echo "Checking whether SageMath should install SPKG $1..." >& AS_MESSAGE_FD AS_BOX([Checking whether SageMath should install SPKG $1...]) >& AS_MESSAGE_LOG_FD @@ -140,6 +165,13 @@ AS_VAR_IF(SPKG_INSTALL, [no], [ dnl Run POST $5 +dnl Restore the message file descriptor that we clobbered earlier +dnl for the sake of hiding site package check noise. It's possible +dnl that we've already done this above, but it doesn't hurt to do +dnl it again, and we want everything "back to normal" at the end +dnl of this macro. +exec AS_MESSAGE_FD<&9 + # END SAGE_SPKG_CONFIGURE_]m4_toupper($1)[ m4_popdef([SPKG_USE_SYSTEM]) m4_popdef([SPKG_REQUIRE]) diff --git a/tox.ini b/tox.ini index 99b2c278e24..f7e63767de5 100644 --- a/tox.ini +++ b/tox.ini @@ -187,6 +187,8 @@ setenv = develop: EXTRA_SAGE_PACKAGES_4=_develop $(head -n 1 build/pkgs/_develop/dependencies) minimal: SAGE_PACKAGE_LIST_ARGS=_prereq maximal: SAGE_PACKAGE_LIST_ARGS=:standard: :optional: + sitepackages: ENABLE_SYSTEM_SITE_PACKAGES=yes + sitepackages: CONFIG_CONFIGURE_ARGS_SITEPACKAGES=--enable-system-site-packages conda-environment: SAGE_PACKAGE_LIST_ARGS=_prereq # Whether to add the system packages needed for bootstrapping EXTRA_SAGE_PACKAGES_0=_bootstrap @@ -476,8 +478,9 @@ setenv = # Resulting full image:tag name # docker: FULL_BASE_IMAGE_AND_TAG={env:ARCH_IMAGE_PREFIX:}{env:BASE_IMAGE}{env:ARCH_IMAGE_SUFFIX:}:{env:ARCH_TAG_PREFIX:}{env:BASE_TAG}{env:ARCH_TAG_SUFFIX:} - docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed -E "s/(docker-|-incremental)//g")-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev} - docker-incremental: SKIP_SYSTEM_PKG_INSTALL=yes + docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed -E "s/(docker-|-incremental|-sitepackages)//g")-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev} + docker-incremental: SKIP_SYSTEM_PKG_INSTALL=yes + docker-incremental-sitepackages: SKIP_SYSTEM_PKG_INSTALL=no # docker-nobootstrap: BOOTSTRAP=./bootstrap -D ### @@ -601,12 +604,14 @@ setenv = # # Resulting full configuration args, including EXTRA_CONFIGURE_ARGS from the user environment # - CONFIGURE_ARGS=--enable-experimental-packages --enable-download-from-upstream-url {env:CONFIG_CONFIGURE_ARGS_ROOT:} {env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:} + CONFIGURE_ARGS=--enable-experimental-packages --enable-download-from-upstream-url {env:CONFIG_CONFIGURE_ARGS_ROOT:} {env:CONFIG_CONFIGURE_ARGS_SITEPACKAGES:} {env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:} # # Resulting EXTRA_SAGE_PACKAGES # ALL_EXTRA_SAGE_PACKAGES={env:EXTRA_SAGE_PACKAGES_0:} {env:EXTRA_SAGE_PACKAGES_1:} {env:EXTRA_SAGE_PACKAGES_2:} {env:EXTRA_SAGE_PACKAGES_3:} {env:EXTRA_SAGE_PACKAGES_4:} {env:EXTRA_SAGE_PACKAGES_5:} {env:EXTRA_SAGE_PACKAGES:} + sitepackages: IGNORE_MISSING_SYSTEM_PACKAGES=yes + # environment will be skipped if regular expression does not match against the sys.platform string platform = local-macos: darwin