From 65277dc4f6f86d41e120c662234ab814e0ea2adb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 1 May 2023 09:15:35 -0700 Subject: [PATCH 01/15] Remove conda.txt for mathics, pari_jupyter --- build/pkgs/mathics/distros/conda.txt | 1 - build/pkgs/pari_jupyter/distros/conda.txt | 1 - 2 files changed, 2 deletions(-) delete mode 100644 build/pkgs/mathics/distros/conda.txt delete mode 100644 build/pkgs/pari_jupyter/distros/conda.txt diff --git a/build/pkgs/mathics/distros/conda.txt b/build/pkgs/mathics/distros/conda.txt deleted file mode 100644 index 800ac5e8aa4..00000000000 --- a/build/pkgs/mathics/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -mathics3 diff --git a/build/pkgs/pari_jupyter/distros/conda.txt b/build/pkgs/pari_jupyter/distros/conda.txt deleted file mode 100644 index bed514a267c..00000000000 --- a/build/pkgs/pari_jupyter/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -pari_jupyter From e18a7abb193083148042e0c4e6dd6f33b676e317 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 1 May 2023 16:36:20 -0700 Subject: [PATCH 02/15] build/pkgs/jupymake: Omit from src/environment-optional.yml --- build/pkgs/jupymake/conda.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/jupymake/conda.txt diff --git a/build/pkgs/jupymake/conda.txt b/build/pkgs/jupymake/conda.txt new file mode 100644 index 00000000000..cbe1e95bc17 --- /dev/null +++ b/build/pkgs/jupymake/conda.txt @@ -0,0 +1 @@ +# The presence of this file ensures that we do not try to pip-install JuPyMake (there is no polymake conda package). From addd6e473d107e191c7378ed463eee2dbf302d4b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 1 May 2023 16:37:18 -0700 Subject: [PATCH 03/15] build/pkgs/pari_jupyter: Restore conda.txt --- build/pkgs/pari_jupyter/distros/conda.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/pari_jupyter/distros/conda.txt diff --git a/build/pkgs/pari_jupyter/distros/conda.txt b/build/pkgs/pari_jupyter/distros/conda.txt new file mode 100644 index 00000000000..bed514a267c --- /dev/null +++ b/build/pkgs/pari_jupyter/distros/conda.txt @@ -0,0 +1 @@ +pari_jupyter From 346b16d80fe0626c754538ef3d3f079b9dfbdc5c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 1 May 2023 18:06:02 -0700 Subject: [PATCH 04/15] build/pkgs/jupymake/distros/conda.txt: Fix up --- build/pkgs/jupymake/{ => distros}/conda.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/pkgs/jupymake/{ => distros}/conda.txt (100%) diff --git a/build/pkgs/jupymake/conda.txt b/build/pkgs/jupymake/distros/conda.txt similarity index 100% rename from build/pkgs/jupymake/conda.txt rename to build/pkgs/jupymake/distros/conda.txt From d46bfa9d758e0c27d383e1daef9a7a9516fb9bf0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 2 May 2023 18:35:13 -0700 Subject: [PATCH 05/15] build/pkgs: Add some more conda.txt --- build/pkgs/argon2_cffi_bindings/distros/conda.txt | 1 + build/pkgs/contourpy/distros/conda.txt | 1 + build/pkgs/hatch_fancy_pypi_readme/distros/conda.txt | 1 + build/pkgs/hatch_nodejs_version/distros/conda.txt | 1 + build/pkgs/hatch_vcs/distros/conda.txt | 1 + build/pkgs/jupyterlab_widgets/distros/conda.txt | 1 + build/pkgs/meson/distros/conda.txt | 1 + build/pkgs/meson_python/distros/conda.txt | 1 + build/pkgs/pyproject_metadata/distros/conda.txt | 1 + 9 files changed, 9 insertions(+) create mode 100644 build/pkgs/argon2_cffi_bindings/distros/conda.txt create mode 100644 build/pkgs/contourpy/distros/conda.txt create mode 100644 build/pkgs/hatch_fancy_pypi_readme/distros/conda.txt create mode 100644 build/pkgs/hatch_nodejs_version/distros/conda.txt create mode 100644 build/pkgs/hatch_vcs/distros/conda.txt create mode 100644 build/pkgs/jupyterlab_widgets/distros/conda.txt create mode 100644 build/pkgs/meson/distros/conda.txt create mode 100644 build/pkgs/meson_python/distros/conda.txt create mode 100644 build/pkgs/pyproject_metadata/distros/conda.txt diff --git a/build/pkgs/argon2_cffi_bindings/distros/conda.txt b/build/pkgs/argon2_cffi_bindings/distros/conda.txt new file mode 100644 index 00000000000..50485097375 --- /dev/null +++ b/build/pkgs/argon2_cffi_bindings/distros/conda.txt @@ -0,0 +1 @@ +argon2-cffi-bindings diff --git a/build/pkgs/contourpy/distros/conda.txt b/build/pkgs/contourpy/distros/conda.txt new file mode 100644 index 00000000000..4c311115d71 --- /dev/null +++ b/build/pkgs/contourpy/distros/conda.txt @@ -0,0 +1 @@ +contourpy diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/conda.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/conda.txt new file mode 100644 index 00000000000..6d9a1f85903 --- /dev/null +++ b/build/pkgs/hatch_fancy_pypi_readme/distros/conda.txt @@ -0,0 +1 @@ +hatch-fancy-pypi-readme diff --git a/build/pkgs/hatch_nodejs_version/distros/conda.txt b/build/pkgs/hatch_nodejs_version/distros/conda.txt new file mode 100644 index 00000000000..5c606fe80f5 --- /dev/null +++ b/build/pkgs/hatch_nodejs_version/distros/conda.txt @@ -0,0 +1 @@ +hatch-nodejs-version diff --git a/build/pkgs/hatch_vcs/distros/conda.txt b/build/pkgs/hatch_vcs/distros/conda.txt new file mode 100644 index 00000000000..04e2069fbb3 --- /dev/null +++ b/build/pkgs/hatch_vcs/distros/conda.txt @@ -0,0 +1 @@ +hatch-vcs diff --git a/build/pkgs/jupyterlab_widgets/distros/conda.txt b/build/pkgs/jupyterlab_widgets/distros/conda.txt new file mode 100644 index 00000000000..0800dc09838 --- /dev/null +++ b/build/pkgs/jupyterlab_widgets/distros/conda.txt @@ -0,0 +1 @@ +jupyterlab-widgets diff --git a/build/pkgs/meson/distros/conda.txt b/build/pkgs/meson/distros/conda.txt new file mode 100644 index 00000000000..0b9952eaa15 --- /dev/null +++ b/build/pkgs/meson/distros/conda.txt @@ -0,0 +1 @@ +meson diff --git a/build/pkgs/meson_python/distros/conda.txt b/build/pkgs/meson_python/distros/conda.txt new file mode 100644 index 00000000000..9705cab644e --- /dev/null +++ b/build/pkgs/meson_python/distros/conda.txt @@ -0,0 +1 @@ +meson-python diff --git a/build/pkgs/pyproject_metadata/distros/conda.txt b/build/pkgs/pyproject_metadata/distros/conda.txt new file mode 100644 index 00000000000..7ca7140f9d4 --- /dev/null +++ b/build/pkgs/pyproject_metadata/distros/conda.txt @@ -0,0 +1 @@ +pyproject-metadata From 0da1ac2fe8b032ca1c4cb697132d7fe3006dbd96 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 2 May 2023 18:42:08 -0700 Subject: [PATCH 06/15] build/pkgs/jupyterlab_widgets/distros/conda.txt: Fix up --- build/pkgs/jupyterlab_widgets/distros/conda.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/jupyterlab_widgets/distros/conda.txt b/build/pkgs/jupyterlab_widgets/distros/conda.txt index 0800dc09838..185418ca78f 100644 --- a/build/pkgs/jupyterlab_widgets/distros/conda.txt +++ b/build/pkgs/jupyterlab_widgets/distros/conda.txt @@ -1 +1 @@ -jupyterlab-widgets +jupyterlab_widgets From aafebf4d4637bd8c6adee6c35dce980aa11787c4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 2 May 2023 18:57:27 -0700 Subject: [PATCH 07/15] build/pkgs/pycygwin: Do not install on conda --- build/pkgs/pycygwin/distros/conda.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/pycygwin/distros/conda.txt diff --git a/build/pkgs/pycygwin/distros/conda.txt b/build/pkgs/pycygwin/distros/conda.txt new file mode 100644 index 00000000000..ff24f9d7844 --- /dev/null +++ b/build/pkgs/pycygwin/distros/conda.txt @@ -0,0 +1 @@ +# The presence of this file ensures that we do not try to pip-install pycygwin -- which would fail with a compilation error From 3fb54ffd030e73576b3557a4ac3e32494d77c91a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 27 Sep 2023 11:40:53 -0700 Subject: [PATCH 08/15] build/pkgs: Add missing conda.txt --- build/pkgs/cachetools/distros/conda.txt | 1 + build/pkgs/calver/distros/conda.txt | 1 + build/pkgs/chardet/distros/conda.txt | 1 + build/pkgs/colorama/distros/conda.txt | 1 + build/pkgs/pyproject_api/distros/conda.txt | 1 + build/pkgs/trove_classifiers/distros/conda.txt | 1 + 6 files changed, 6 insertions(+) create mode 100644 build/pkgs/cachetools/distros/conda.txt create mode 100644 build/pkgs/calver/distros/conda.txt create mode 100644 build/pkgs/chardet/distros/conda.txt create mode 100644 build/pkgs/colorama/distros/conda.txt create mode 100644 build/pkgs/pyproject_api/distros/conda.txt create mode 100644 build/pkgs/trove_classifiers/distros/conda.txt diff --git a/build/pkgs/cachetools/distros/conda.txt b/build/pkgs/cachetools/distros/conda.txt new file mode 100644 index 00000000000..50d14084a9b --- /dev/null +++ b/build/pkgs/cachetools/distros/conda.txt @@ -0,0 +1 @@ +cachetools diff --git a/build/pkgs/calver/distros/conda.txt b/build/pkgs/calver/distros/conda.txt new file mode 100644 index 00000000000..62948b78bc0 --- /dev/null +++ b/build/pkgs/calver/distros/conda.txt @@ -0,0 +1 @@ +calver diff --git a/build/pkgs/chardet/distros/conda.txt b/build/pkgs/chardet/distros/conda.txt new file mode 100644 index 00000000000..79236f25cda --- /dev/null +++ b/build/pkgs/chardet/distros/conda.txt @@ -0,0 +1 @@ +chardet diff --git a/build/pkgs/colorama/distros/conda.txt b/build/pkgs/colorama/distros/conda.txt new file mode 100644 index 00000000000..3fcfb51b2ad --- /dev/null +++ b/build/pkgs/colorama/distros/conda.txt @@ -0,0 +1 @@ +colorama diff --git a/build/pkgs/pyproject_api/distros/conda.txt b/build/pkgs/pyproject_api/distros/conda.txt new file mode 100644 index 00000000000..3f2ab4cb2a0 --- /dev/null +++ b/build/pkgs/pyproject_api/distros/conda.txt @@ -0,0 +1 @@ +pyproject-api diff --git a/build/pkgs/trove_classifiers/distros/conda.txt b/build/pkgs/trove_classifiers/distros/conda.txt new file mode 100644 index 00000000000..b8333e0eb25 --- /dev/null +++ b/build/pkgs/trove_classifiers/distros/conda.txt @@ -0,0 +1 @@ +trove-classifiers From 22ba07b3d347fb7bdf40d46251bbb7e059ba1927 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 2 Oct 2023 21:24:03 -0700 Subject: [PATCH 09/15] bootstrap-conda: Minimize environments --- bootstrap-conda | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/bootstrap-conda b/bootstrap-conda index c64e2a72b6c..aa59e471767 100755 --- a/bootstrap-conda +++ b/bootstrap-conda @@ -17,6 +17,8 @@ OPTIONAL_PACKAGES= SAGELIB_PACKAGES= SAGELIB_OPTIONAL_PACKAGES= DEVELOP_PACKAGES= +UNCONSTRAINED_PACKAGES= +CONSTRAINED_PACKAGES= eval $(sage-package properties --format=shell :all:) @@ -25,6 +27,15 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt --exclude _sage SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/conda.txt PKG_SYSTEM_PACKAGES=$(echo $(${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE)) if [ -n "$PKG_SYSTEM_PACKAGES" ]; then + case "$PKG_SYSTEM_PACKAGES" in + *([-A-Za-z0-9_ ])) # just a package name + UNCONSTRAINED_PACKAGES+=" $PKG_BASE" + ;; + *) # a package name with version constraints or other decorations; + # we never remove such packages when minimizing package lists + CONSTRAINED_PACKAGES+=" $PKG_BASE" + ;; + esac if [ -f $PKG_SCRIPTS/spkg-configure.m4 ]; then if grep -q SAGE_PYTHON_PACKAGE_CHECK $PKG_SCRIPTS/spkg-configure.m4; then # Python package that would need --enable-system-site-packages to be used @@ -67,7 +78,34 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt --exclude _sage done unset PKG_SYSTEM_PACKAGES -[ -n "$BOOTSTRAP_VERBOSE" ] && echo "## Collected:" && set | grep PACKAGES= +[ -n "$BOOTSTRAP_VERBOSE" ] && printf "##\n## Collected:\n##\n" && set | grep PACKAGES= + +# Minimize + + PACKAGES=$(sage-package list $(sage-package list --include-dependencies $PACKAGES --exclude $UNCONSTRAINED_PACKAGES) \ + $(sage-package list --exclude-dependencies $PACKAGES)) + + BOOTSTRAP_PACKAGES=$(sage-package list $(sage-package list --include-dependencies $BOOTSTRAP_PACKAGES --exclude $UNCONSTRAINED_PACKAGES) \ + $(sage-package list --exclude-dependencies $BOOTSTRAP_PACKAGES) \ + --exclude $(sage-package list --include-dependencies $PACKAGES)) + + DEVELOP_PACKAGES=$(sage-package list $(sage-package list --include-dependencies $DEVELOP_PACKAGES --exclude $UNCONSTRAINED_PACKAGES) \ + $(sage-package list --exclude-dependencies $DEVELOP_PACKAGES) \ + --exclude $(sage-package list --include-dependencies $PACKAGES $BOOTSTRAP_PACKAGES)) + + OPTIONAL_PACKAGES=$(sage-package list $(sage-package list --include-dependencies $OPTIONAL_PACKAGES --exclude $UNCONSTRAINED_PACKAGES) \ + $(sage-package list --exclude-dependencies $OPTIONAL_PACKAGES) \ + --exclude $(sage-package list --include-dependencies $PACKAGES $BOOTSTRAP_PACKAGES)) + + SAGELIB_PACKAGES=$(sage-package list $(sage-package list --include-dependencies $SAGELIB_PACKAGES --exclude $UNCONSTRAINED_PACKAGES) \ + $(sage-package list --exclude-dependencies $SAGELIB_PACKAGES) \ + --exclude $(sage-package list --include-dependencies $PACKAGES $BOOTSTRAP_PACKAGES)) + +SAGELIB_OPTIONAL_PACKAGES=$(sage-package list $(sage-package list --include-dependencies $SAGELIB_OPTIONAL_PACKAGES --exclude $UNCONSTRAINED_PACKAGES) \ + $(sage-package list --exclude-dependencies $SAGELIB_OPTIONAL_PACKAGES) \ + --exclude $(sage-package list --include-dependencies $PACKAGES $BOOTSTRAP_PACKAGES $SAGELIB_PACKAGES $OPTIONAL_PACKAGES)) + +[ -n "$BOOTSTRAP_VERBOSE" ] && printf "##\n## Minimized:\n##\n" && set | grep PACKAGES= # Translate to system packages export ENABLE_SYSTEM_SITE_PACKAGES=yes # Disable filtering in sage-get-system-packages @@ -79,7 +117,7 @@ SAGELIB_OPTIONAL_SYSTEM_PACKAGES=$(sage-get-system-packages conda $SAGELIB_OPTIO DEVELOP_SYSTEM_PACKAGES=$(sage-get-system-packages conda $DEVELOP_PACKAGES) unset ENABLE_SYSTEM_SITE_PACKAGES -[ -n "$BOOTSTRAP_VERBOSE" ] && echo "## Translated to system:" && set | grep SYSTEM_PACKAGES= +[ -n "$BOOTSTRAP_VERBOSE" ] && printf "##\n## Translated to system:\n##\n" && set | grep SYSTEM_PACKAGES= echo >&2 $0:$LINENO: generate conda environment files From fcb537dae112954f87d41fd1e1bc0fbfd149350e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 18 Dec 2023 16:21:10 -0800 Subject: [PATCH 10/15] build/pkgs: Make boost_cropped an order-only dep (it's header-only) --- build/pkgs/brial/dependencies | 2 +- build/pkgs/e_antic/dependencies | 2 +- build/pkgs/papilo/dependencies | 2 +- build/pkgs/sagelib/dependencies | 2 +- build/pkgs/soplex/dependencies | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/pkgs/brial/dependencies b/build/pkgs/brial/dependencies index fdc17b08c96..b1478c5d070 100644 --- a/build/pkgs/brial/dependencies +++ b/build/pkgs/brial/dependencies @@ -1,4 +1,4 @@ -boost_cropped m4ri libpng | pkgconf +m4ri libpng | pkgconf boost_cropped ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/e_antic/dependencies b/build/pkgs/e_antic/dependencies index 8e977a55c13..2f44f9420a2 100644 --- a/build/pkgs/e_antic/dependencies +++ b/build/pkgs/e_antic/dependencies @@ -1,4 +1,4 @@ -$(MP_LIBRARY) flint boost_cropped +$(MP_LIBRARY) flint | boost_cropped ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/papilo/dependencies b/build/pkgs/papilo/dependencies index 0ec4f49b131..91b517b965d 100644 --- a/build/pkgs/papilo/dependencies +++ b/build/pkgs/papilo/dependencies @@ -1 +1 @@ -$(MP_LIBRARY) boost_cropped onetbb $(BLAS) gfortran | cmake +$(MP_LIBRARY) onetbb $(BLAS) gfortran | cmake boost_cropped diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies index b1ebfd0825e..7e9f687c0ad 100644 --- a/build/pkgs/sagelib/dependencies +++ b/build/pkgs/sagelib/dependencies @@ -1,4 +1,4 @@ -FORCE $(SCRIPTS) boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources 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 $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran +FORCE $(SCRIPTS) $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources 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 $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran boost_cropped ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/soplex/dependencies b/build/pkgs/soplex/dependencies index 32c8bdd67ec..34ed6d2cf4f 100644 --- a/build/pkgs/soplex/dependencies +++ b/build/pkgs/soplex/dependencies @@ -1 +1 @@ -$(MP_LIBRARY) mpfr boost_cropped zlib papilo | cmake +$(MP_LIBRARY) mpfr zlib papilo | cmake boost_cropped From 38c8c2c6a34f13acbd637487389583bd37c9f433 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 22 Jun 2024 16:38:43 -0700 Subject: [PATCH 11/15] bootstrap-conda: Add pip lines also in src/environment.yml --- bootstrap-conda | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap-conda b/bootstrap-conda index aa59e471767..aa009b63343 100755 --- a/bootstrap-conda +++ b/bootstrap-conda @@ -171,6 +171,7 @@ echo >&2 $0:$LINENO: generate conda environment files ( echo >&4 " - pip:" echo >&5 " - pip:" + echo >&6 " - pip:" for PKG_BASE in $(sage-package list :standard: :optional: --has-file requirements.txt --no-file distros/conda.txt --no-file src; sage-package list :standard: :optional: --has-file version_requirements.txt --no-file requirements.txt --no-file distros/conda.txt --no-file src); do eval PKG_SCRIPTS=\$path_$PKG_BASE PKG_TYPE=\$type_$PKG_BASE SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/requirements.txt @@ -182,7 +183,7 @@ echo >&2 $0:$LINENO: generate conda environment files else case "$PKG_BASE:$PKG_TYPE" in $DEVELOP_SPKG_PATTERN:*) FD=4;; - *:standard) FD="4 5";; + *:standard) FD="4 5 6";; *) FD=5;; esac ${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE | while read -r line; do @@ -190,7 +191,7 @@ echo >&2 $0:$LINENO: generate conda environment files done fi done - ) 4>> /dev/null 5>> src/environment-optional-template.yml + ) 4>> /dev/null 5>> src/environment-optional-template.yml 6>>src/environment-template.yml for f in environment environment-optional src/environment src/environment-optional src/environment-dev; do for python_version in 3.9 3.10 3.11; do From db482e2baf866532999055e385043a1ba306ce74 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 25 Nov 2023 13:11:32 -0800 Subject: [PATCH 12/15] build/pkgs/cliquer/distros/conda.txt: Add lower bound --- build/pkgs/cliquer/distros/conda.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/pkgs/cliquer/distros/conda.txt b/build/pkgs/cliquer/distros/conda.txt index 524938db8e3..64789e8d478 100644 --- a/build/pkgs/cliquer/distros/conda.txt +++ b/build/pkgs/cliquer/distros/conda.txt @@ -1 +1,3 @@ -cliquer +cliquer>=1.21 +# We include the version constraint so that bootstrap-conda's environment minimizer +# does not eliminate it (as a declared dependency of the giac SPKG) From 8b8c45e0e863006399942270f1809210c60b2755 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 25 Nov 2023 14:42:40 -0800 Subject: [PATCH 13/15] build/pkgs/{ecl,gc,libatomic_ops}: Add version bounds for conda --- build/pkgs/ecl/distros/conda.txt | 2 +- build/pkgs/gc/distros/conda.txt | 2 +- build/pkgs/libatomic_ops/distros/conda.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/ecl/distros/conda.txt b/build/pkgs/ecl/distros/conda.txt index 100aa2efb32..9394ddfe11b 100644 --- a/build/pkgs/ecl/distros/conda.txt +++ b/build/pkgs/ecl/distros/conda.txt @@ -1 +1 @@ -ecl +ecl>=21.2.1 diff --git a/build/pkgs/gc/distros/conda.txt b/build/pkgs/gc/distros/conda.txt index f09f27a449a..b414550bad2 100644 --- a/build/pkgs/gc/distros/conda.txt +++ b/build/pkgs/gc/distros/conda.txt @@ -1 +1 @@ -bdw-gc +bdw-gc>=7.6.4 diff --git a/build/pkgs/libatomic_ops/distros/conda.txt b/build/pkgs/libatomic_ops/distros/conda.txt index a6f2a51c512..d26fc733055 100644 --- a/build/pkgs/libatomic_ops/distros/conda.txt +++ b/build/pkgs/libatomic_ops/distros/conda.txt @@ -1 +1 @@ -libatomic_ops +libatomic_ops>=7.6.2 From 5af6f07ea2061870ad021e20bff06cae4628859e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 25 Nov 2023 15:03:53 -0800 Subject: [PATCH 14/15] pkgs/sage-conf_conda/setup.py: Do not use force for packages that may be eliminated by the bootstrap-conda environment minimizer --- pkgs/sage-conf_conda/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/sage-conf_conda/setup.py b/pkgs/sage-conf_conda/setup.py index 96f163dfe5a..81fb8d7925e 100644 --- a/pkgs/sage-conf_conda/setup.py +++ b/pkgs/sage-conf_conda/setup.py @@ -30,7 +30,7 @@ def run(self): cmd = f"cd {SAGE_ROOT} && ./configure --enable-build-as-root --with-system-python3=force --disable-notebook --disable-sagelib --disable-sage_conf --disable-doc" cmd += ' --with-python=$CONDA_PREFIX/bin/python --prefix="$CONDA_PREFIX"' - cmd += ' $(for pkg in $(PATH="build/bin:$PATH" build/bin/sage-package list :standard: --exclude rpy2 --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)' + cmd += ' $(for pkg in $(PATH="build/bin:$PATH" build/bin/sage-package list :standard: --exclude rpy2 --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude-dependencies); do echo --with-system-$pkg=force; done)' print(f"Running {cmd}") sys.stdout.flush() if os.system(cmd) != 0: From a5e4c8f505a72f33fc7cc24757bf1f50059ee2a2 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 25 Nov 2023 15:42:25 -0800 Subject: [PATCH 15/15] pkgs/sage-conf_conda/setup.py: Use --enable-system-sitepackages --- pkgs/sage-conf_conda/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/sage-conf_conda/setup.py b/pkgs/sage-conf_conda/setup.py index 81fb8d7925e..91203f1decf 100644 --- a/pkgs/sage-conf_conda/setup.py +++ b/pkgs/sage-conf_conda/setup.py @@ -29,7 +29,7 @@ def run(self): 'See https://doc.sagemath.org/html/en/installation/conda.html on how to get started.') cmd = f"cd {SAGE_ROOT} && ./configure --enable-build-as-root --with-system-python3=force --disable-notebook --disable-sagelib --disable-sage_conf --disable-doc" - cmd += ' --with-python=$CONDA_PREFIX/bin/python --prefix="$CONDA_PREFIX"' + cmd += ' --with-python=$CONDA_PREFIX/bin/python --prefix="$CONDA_PREFIX" --enable-system-site-packages' cmd += ' $(for pkg in $(PATH="build/bin:$PATH" build/bin/sage-package list :standard: --exclude rpy2 --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude-dependencies); do echo --with-system-$pkg=force; done)' print(f"Running {cmd}") sys.stdout.flush()