From d626aa8517395d30f9db813246a1204856398bfd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 26 Mar 2021 22:07:02 -0700 Subject: [PATCH 1/6] build/pkgs/pplpy/dependencies: Depend on sphinx only if SAGE_SPKG_INSTALL_DOCS!=no --- build/pkgs/pplpy/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/pplpy/dependencies b/build/pkgs/pplpy/dependencies index 16e271bb5f9..c61defdb7ed 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 +$(PYTHON) $(MP_LIBRARY) gmpy2 cysignals mpfr mpc ppl | $(PYTHON_TOOLCHAIN) $(if $(findstring no,$(SAGE_SPKG_INSTALL_DOCS)),,sphinx) ---------- All lines of this file are ignored except the first. From 82ce5390f94475b3941c69524280fb5a36fa7052 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 24 Mar 2021 22:06:14 -0700 Subject: [PATCH 2/6] configure.ac: If --disable-notebook and --disable-sagelib, do not build zeromq etc. configure.ac (--disable-notebook): Disable argon2_cffi configure.ac (--disable-notebook --disable-sagelib): Disable ipython --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a4093a2d4ee..6395cb4b80a 100644 --- a/configure.ac +++ b/configure.ac @@ -448,7 +448,13 @@ AC_ARG_ENABLE([cvxopt], AC_ARG_ENABLE([notebook], AS_HELP_STRING([--disable-notebook], [disable build of the Jupyter notebook and related packages]), [ - for pkg in notebook nbconvert sagenb_export nbformat terminado send2trash prometheus_client mistune pandocfilters bleach defusedxml jsonschema jupyter_jsmol; do + for pkg in notebook nbconvert sagenb_export nbformat terminado send2trash prometheus_client mistune pandocfilters bleach defusedxml jsonschema jupyter_jsmol argon2_cffi; do + AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) + done + ]) + +AS_IF([test "$SAGE_ENABLE_notebook" = no -a "$SAGE_ENABLE_sagelib" = no], [ + for pkg in jupyter_client ipykernel ipython zeromq pyzmq; do AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) done ]) From 02505ca6d353e44253f8e461055fe1f2ca6bb995 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 27 Sep 2021 15:28:26 -0700 Subject: [PATCH 3/6] pkgs/sage-conf_pypi/MANIFEST.in: Update from #31396 --- pkgs/sage-conf_pypi/MANIFEST.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/sage-conf_pypi/MANIFEST.in b/pkgs/sage-conf_pypi/MANIFEST.in index 121c9edde97..be45d90781d 100644 --- a/pkgs/sage-conf_pypi/MANIFEST.in +++ b/pkgs/sage-conf_pypi/MANIFEST.in @@ -4,13 +4,14 @@ graft bin graft sage_root # These sources are not needed because individual distributions of these are made. prune sage_root/build/pkgs/*/src* +prune sage_root/pkgs # Except for this one because config.status writes there -graft sage_root/build/pkgs/sage_conf/src -prune sage_root/build/pkgs/sage_conf/src/build +graft sage_root/pkgs/sage-conf +prune sage_root/pkgs/sage-conf/build # And this one because of declared dependencies on source files in Makefile.in -graft sage_root/build/pkgs/sage_docbuild/src -prune sage_root/build/pkgs/sage_docbuild/src/build -prune sage_root/build/pkgs/sage_docbuild/src/sage_docbuild.egg-info +graft sage_root/pkgs/sage-docbuild +prune sage_root/pkgs/sage-docbuild/build +prune sage_root/pkgs/sage-docbuild/*.egg-info # global-exclude .tox global-exclude *~* From aeca1a03015f27b74c6641cb7bbcdd9c5e82bf16 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 27 Sep 2021 15:31:05 -0700 Subject: [PATCH 4/6] Makefile (pypi-sdists): Add sage_setup --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 26e79b800e4..7f9c878373a 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ pypi-sdists: sage_setup ./sage --sh build/pkgs/sage_setup/spkg-src ./sage --sh build/pkgs/sage_sws2rst/spkg-src ./sage --sh build/pkgs/sage_docbuild/spkg-src + ./sage --sh build/pkgs/sage_setup/spkg-src ./sage --sh build/pkgs/sagelib/spkg-src @echo "Built sdists are in upstream/" From cd3dce9e076ba81febc4e8f838e1b5ca03b12459 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 27 Sep 2021 16:52:54 -0700 Subject: [PATCH 5/6] pkgs/sage-conf_pypi/setup.py: Update directory of configured sage_conf.py --- pkgs/sage-conf_pypi/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/sage-conf_pypi/setup.py b/pkgs/sage-conf_pypi/setup.py index 8091754c4ff..f4e76a5e4ff 100644 --- a/pkgs/sage-conf_pypi/setup.py +++ b/pkgs/sage-conf_pypi/setup.py @@ -60,7 +60,7 @@ def run(self): raise DistutilsSetupError("make build-local failed") # Install configuration - shutil.copyfile(os.path.join(SAGE_ROOT, 'build', 'pkgs', 'sage_conf', 'src', 'sage_conf.py'), + shutil.copyfile(os.path.join(SAGE_ROOT, 'pkgs', 'sage-conf', 'sage_conf.py'), os.path.join(HERE, 'sage_conf.py')) if not self.distribution.py_modules: self.py_modules = self.distribution.py_modules = [] From c695921c3cee61a32a8d7ec9443bb4e315eb481b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 27 Sep 2021 17:50:03 -0700 Subject: [PATCH 6/6] pkgs/sage-conf/sage_conf.py.in (SAGE_SPKG_WHEELS): Update so it works if SAGE_VENV != SAGE_LOCAL --- pkgs/sage-conf/sage_conf.py.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/sage-conf/sage_conf.py.in b/pkgs/sage-conf/sage_conf.py.in index ec5ee889107..3f821f05264 100644 --- a/pkgs/sage-conf/sage_conf.py.in +++ b/pkgs/sage-conf/sage_conf.py.in @@ -44,7 +44,9 @@ THREEJS_DIR = SAGE_LOCAL + "/share/threejs-sage" OPENMP_CFLAGS = "@OPENMP_CFLAGS@" OPENMP_CXXFLAGS = "@OPENMP_CXXFLAGS@" -SAGE_SPKG_WHEELS = "@prefix@/var/lib/sage/wheels" +# Installation location of wheels. This is determined at configuration time +# and does not depend on the installation location of sage-conf. +SAGE_SPKG_WHEELS = "@SAGE_VENV@".replace('${SAGE_LOCAL}', SAGE_LOCAL) + "/var/lib/sage/wheels" # Entry point 'sage-config'. It does not depend on any packages.