Merge branch 't/29950/build_sagelib_using_installed_sage_setup' into …

…t/30010/split_sage_setup_docbuild_out_to_a_separate_package

.gitignore

@@ -101,6 +101,12 @@ gitlab-build-docker.log
 /src/bin/sage-env-config
 /build/bin/sage-build-env-config
 
+/build/pkgs/*/src/build
+/build/pkgs/*/src/dist
+/build/pkgs/*/src/MANIFEST
+/build/pkgs/*/src/*.egg-info
+/build/pkgs/*/src/.tox
+
 #######################
 # tox generated files #
 #######################

build/pkgs/sagelib/spkg-install

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-cd "$SAGE_SRC"
+cd src
 ## All sagelib-building is done by setup.py.
 ## This is so that sagelib can be installed by standard Python procedures,
 ## such as "./setup.py install" or "pip install ."

build/pkgs/sagelib/spkg-src

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Script to prepare an sdist tarball for sagelib
+# This script is not used during build.
+#
+# HOW TO MAKE THE TARBALL:
+# ./sage --sh build/pkgs/sagelib/spkg-src
+
+if [ -z "$SAGE_ROOT" ] ; then
+    echo >&2 "Error - SAGE_ROOT undefined ... exiting"
+    echo >&2 "Maybe run 'sage -sh'?"
+    exit 1
+fi
+
+# Exit on failure
+set -e
+
+cd build/pkgs/sagelib
+
+cd src
+sage-python23 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES"

build/pkgs/sagelib/src/MANIFEST.in

@@ -0,0 +1,8 @@
+global-include *.c *.cc *.cpp *.h *.hh *.hpp *.inc *.py *.pyx *.pxd *.pxi *.rst *.txt *.tex
+
+include MANIFEST.in
+
+prune .tox
+
+graft   sage/libs/gap/test
+prune sage/ext/interpreters   # In particular, __init__.py must not be present in the distribution; or sage_setup.autogen.interpreters.rebuild will not generate the code

build/pkgs/sagelib/src/bin

@@ -0,0 +1 @@
+../../../../src/bin

build/pkgs/sagelib/src/requirements.txt

@@ -0,0 +1,19 @@
+#sage_conf
+#sage_setup
+six             # use of six should be removed from sage_setup
+Cython==0.29.17
+pkgconfig
+cysignals
+gmpy2==2.1.0b1
+
+numpy          # already needed by sage.env
+jinja2         # sage_setup.autogen.interpreters
+
+cypari2        # but building bdist_wheel of cypari2 fails with recent pip... https://github.com/sagemath/cypari2/issues/93
+
+########## Runtime
+
+psutil
+pexpect
+pplpy
+ipython<=5.8

build/pkgs/sagelib/src/sage

@@ -0,0 +1 @@
+../../../../src/sage

build/pkgs/sagelib/src/sage_setup

@@ -0,0 +1 @@
+../../../../src/sage_setup

build/pkgs/sagelib/src/setup.py

@@ -0,0 +1 @@
+../../../../src/setup.py

build/pkgs/sagelib/src/tox.ini

@@ -0,0 +1,35 @@
+# First pip-install tox:
+#
+#   ./sage -pip install tox
+#
+# To build and test in the tox environment:
+#
+# ./sage -sh -c '(cd build/pkgs/sagelib/src && tox -v -v)'
+#
+# To test interactively:
+#
+# build/pkgs/sagelib/src/.tox/python/bin/python
+#
+[tox]
+
+[testenv]
+deps = -rrequirements.txt
+
+passenv =
+    SAGE_LOCAL
+
+setenv =
+    # Sage scripts such as sage-runtests like to use $HOME/.sage
+    HOME={envdir}
+
+whitelist_externals =
+    bash
+
+commands =
+    # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package.
+    python -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.all; print(sage.all.__file__)'
+
+    # FIXME: The following loads sage-env, which loads the wrong Python.
+    sage -c 'import sys; print("sys.path =", sys.path); import sage.all; print(sage.all.__file__)'
+
+    #sage -t --all

src/module_list.py

@@ -1,3 +1,11 @@
+#########################################################
+###
+### OBSOLETE FILE - DO NOT ADD TO IT
+###
+### See https://trac.sagemath.org/ticket/29701
+###
+#########################################################
+
 import os
 from distutils.extension import Extension
 from sage.env import SAGE_LOCAL
@@ -306,8 +314,7 @@
               sources = ['sage/graphs/strongly_regular_db.pyx']),
 
     Extension('sage.graphs.graph_decompositions.rankwidth',
-              sources = ['sage/graphs/graph_decompositions/rankwidth.pyx'],
-              libraries=['rw']),
+              sources = ['sage/graphs/graph_decompositions/rankwidth.pyx']),
 
     Extension('sage.graphs.graph_decompositions.bandwidth',
               sources = ['sage/graphs/graph_decompositions/bandwidth.pyx']),
@@ -317,7 +324,6 @@
 
     OptionalExtension('sage.graphs.graph_decompositions.tdlib',
               sources = ['sage/graphs/graph_decompositions/tdlib.pyx'],
-              language="c++",
               package = 'tdlib'),
 
     Extension('sage.graphs.graph_decompositions.clique_separators',

src/sage/graphs/graph_decompositions/rankwidth.pyx

@@ -1,4 +1,5 @@
 # cython: binding=True
+# distutils: libraries = rw
 r"""
 Rank Decompositions of graphs
 

src/sage/graphs/graph_decompositions/tdlib.pyx

@@ -1,3 +1,6 @@
+# distutils: language = c++
+# sage_setup: distribution = sage-tdlib
+
 r"""
 Interface with TdLib (algorithms for tree decompositions)
 

src/sage_setup/command/sage_build.py

@@ -12,10 +12,21 @@ def run_autogen(self):
         see :trac:`22106`.
         """
         from sage_setup.autogen import autogen_all
+        from sage_setup.find import find_python_sources
+        from sage.env import SAGE_SRC
+
         log.info("Generating auto-generated sources")
-        for pkg in autogen_all():
+
+        pkgs = autogen_all()
+        python_packages, python_modules, cython_modules = find_python_sources(
+            SAGE_SRC, [ pkg.replace('.', '/') for pkg in pkgs])
+
+        for pkg in python_packages:
             if pkg not in self.distribution.packages:
-                    self.distribution.packages.append(pkg)
+                self.distribution.packages.append(pkg)
+
+        for cython_module in cython_modules:
+            self.distribution.ext_modules.append(cython_module)
 
     def run(self):
         self.run_autogen()