Merge sagemath#29865

mkoeppe · Sep 28, 2021 · 4c9a9dd · 4c9a9dd
2 parents aa60ae0 + 96bcf03
commit 4c9a9dd
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git 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
 	./sage --sh build/pkgs/sagemath_objects/spkg-src
 	./sage --sh build/pkgs/sagemath_categories/spkg-src

diff --git 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.

diff --git 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
   ])

diff --git 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.
 

diff --git 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 *~*

diff --git 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 = []