From 5298fd51ff8c2d280817352304c14012cdbe2219 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 13 Jul 2020 14:03:42 -0700 Subject: [PATCH 01/18] build/pkgs/sage_setup_docbuild: New --- build/make/Makefile.in | 2 +- build/pkgs/sage_setup_docbuild/dependencies | 1 + .../sage_setup_docbuild/package-version.txt | 1 + build/pkgs/sage_setup_docbuild/spkg-install | 6 ++++ build/pkgs/sage_setup_docbuild/spkg-src | 21 +++++++++++++ build/pkgs/sage_setup_docbuild/src/README.md | 3 ++ .../sage_setup_docbuild/src/requirements.txt | 3 ++ .../src/sage_setup/docbuild | 1 + build/pkgs/sage_setup_docbuild/src/setup.cfg | 8 +++++ build/pkgs/sage_setup_docbuild/src/setup.py | 7 +++++ build/pkgs/sage_setup_docbuild/src/tox.ini | 30 +++++++++++++++++++ build/pkgs/sage_setup_docbuild/type | 1 + src/sage_setup/__init__.py | 0 13 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 build/pkgs/sage_setup_docbuild/dependencies create mode 120000 build/pkgs/sage_setup_docbuild/package-version.txt create mode 100755 build/pkgs/sage_setup_docbuild/spkg-install create mode 100755 build/pkgs/sage_setup_docbuild/spkg-src create mode 100644 build/pkgs/sage_setup_docbuild/src/README.md create mode 100644 build/pkgs/sage_setup_docbuild/src/requirements.txt create mode 120000 build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild create mode 100644 build/pkgs/sage_setup_docbuild/src/setup.cfg create mode 100644 build/pkgs/sage_setup_docbuild/src/setup.py create mode 100644 build/pkgs/sage_setup_docbuild/src/tox.ini create mode 100644 build/pkgs/sage_setup_docbuild/type delete mode 100644 src/sage_setup/__init__.py diff --git a/build/make/Makefile.in b/build/make/Makefile.in index c91cf7d13e4..b414e215632 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -297,7 +297,7 @@ base: $(inst_patch) $(inst_pkgconf) # Building the documentation has many dependencies, because all # documented modules are imported and because we use matplotlib to # produce plots. -DOC_DEPENDENCIES = sagelib $(inst_sphinx) \ +DOC_DEPENDENCIES = sagelib sage_setup_docbuild $(inst_sphinx) \ | $(SAGERUNTIME) $(inst_maxima) $(inst_networkx) $(inst_scipy) $(inst_sympy) \ $(inst_matplotlib) $(inst_pillow) $(inst_mathjax) $(inst_mpmath) \ $(inst_ipykernel) $(inst_jupyter_client) $(inst_conway_polynomials) \ diff --git a/build/pkgs/sage_setup_docbuild/dependencies b/build/pkgs/sage_setup_docbuild/dependencies new file mode 100644 index 00000000000..757e8c9f683 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib sphinx six | $(PYTHON_TOOLCHAIN) diff --git a/build/pkgs/sage_setup_docbuild/package-version.txt b/build/pkgs/sage_setup_docbuild/package-version.txt new file mode 120000 index 00000000000..cf10fe4b4e4 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/package-version.txt @@ -0,0 +1 @@ +../sagelib/package-version.txt \ No newline at end of file diff --git a/build/pkgs/sage_setup_docbuild/spkg-install b/build/pkgs/sage_setup_docbuild/spkg-install new file mode 100755 index 00000000000..666796dc2cd --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/spkg-install @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +cd src +. sage-dist-helpers +# We install directly with setuptools, not with pip, because pip does not handle our symlinks correctly. +# An alternative would be to build an sdist and then to install the sdist using pip. +sage-python23 -u setup.py --no-user-cfg install --single-version-externally-managed --root=/ diff --git a/build/pkgs/sage_setup_docbuild/spkg-src b/build/pkgs/sage_setup_docbuild/spkg-src new file mode 100755 index 00000000000..69c5e7c190b --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/spkg-src @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Script to prepare an sdist tarball for sage_setup +# This script is not used during build. +# +# HOW TO MAKE THE TARBALL: +# ./sage --sh build/pkgs/sage_setup_docbuild/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/sage_setup_docbuild + +cd src +sage-python23 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sage_setup_docbuild/src/README.md b/build/pkgs/sage_setup_docbuild/src/README.md new file mode 100644 index 00000000000..bc5466846a9 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/README.md @@ -0,0 +1,3 @@ +# sage_setup.docbuild # + +This is the build system of the Sage documentation, based on sphinx. diff --git a/build/pkgs/sage_setup_docbuild/src/requirements.txt b/build/pkgs/sage_setup_docbuild/src/requirements.txt new file mode 100644 index 00000000000..2dedc630e98 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/requirements.txt @@ -0,0 +1,3 @@ +#sage +sphinx +six diff --git a/build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild b/build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild new file mode 120000 index 00000000000..8d56bfb043c --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild @@ -0,0 +1 @@ +../../../../../src/sage_setup/docbuild \ No newline at end of file diff --git a/build/pkgs/sage_setup_docbuild/src/setup.cfg b/build/pkgs/sage_setup_docbuild/src/setup.cfg new file mode 100644 index 00000000000..e35edbad114 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/setup.cfg @@ -0,0 +1,8 @@ +[metadata] +name = sage_setup.docbuild +description = Sage: Open Source Mathematics Software: Build system of the Sage documentation +long_description = file: README.md +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = https://groups.google.com/group/sage-support +url = https://www.sagemath.org diff --git a/build/pkgs/sage_setup_docbuild/src/setup.py b/build/pkgs/sage_setup_docbuild/src/setup.py new file mode 100644 index 00000000000..120ea63bbbb --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/setup.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python + +from setuptools import setup, find_namespace_packages + +setup( + packages=find_namespace_packages() +) diff --git a/build/pkgs/sage_setup_docbuild/src/tox.ini b/build/pkgs/sage_setup_docbuild/src/tox.ini new file mode 100644 index 00000000000..99031e0578b --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/tox.ini @@ -0,0 +1,30 @@ +# First pip-install tox: +# +# ./sage -pip install tox +# +# To build and test in the tox environment: +# +# ./sage -sh -c '(cd build/pkgs/sage_setup_docbuild/src && tox)' +# +# To test interactively: +# +# build/pkgs/sage_setup_docbuild/src/.tox/python/bin/python +# +[tox] + +[testenv] +deps = -rrequirements.txt + +setenv = + # Sage scripts like to use $HOME/.sage + HOME={envdir} + +whitelist_externals = + bash + +commands = + # Beware of the treacherous non-src layout. + #python -c 'import sys; "" in sys.path and sys.path.remove(""); import sage_setup.docbuild' + +# TODO: Add tests after adding the dependency on sagelib to +# requirements.txt diff --git a/build/pkgs/sage_setup_docbuild/type b/build/pkgs/sage_setup_docbuild/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/type @@ -0,0 +1 @@ +standard diff --git a/src/sage_setup/__init__.py b/src/sage_setup/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 From ede9746407ae33c847f154dbc190c9056af3cb69 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 15 Jul 2020 11:55:46 -0700 Subject: [PATCH 02/18] build/pkgs/sagelib/src/MANIFEST.in: Prune sage_setup/docbuild --- build/pkgs/sagelib/src/MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/pkgs/sagelib/src/MANIFEST.in b/build/pkgs/sagelib/src/MANIFEST.in index 7123d149222..f261574e834 100644 --- a/build/pkgs/sagelib/src/MANIFEST.in +++ b/build/pkgs/sagelib/src/MANIFEST.in @@ -6,3 +6,5 @@ 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 + +prune sage_setup/docbuild # Shipped by sage_setup.docbuild From b45fa46f12020c668952a179acaa6ed5150cf86e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 15 Jul 2020 12:24:56 -0700 Subject: [PATCH 03/18] build/pkgs/sage_setup_docbuild: Set version --- build/pkgs/sage_setup_docbuild/src/MANIFEST.in | 1 + build/pkgs/sage_setup_docbuild/src/VERSION.txt | 1 + build/pkgs/sage_setup_docbuild/src/setup.cfg | 1 + 3 files changed, 3 insertions(+) create mode 100644 build/pkgs/sage_setup_docbuild/src/MANIFEST.in create mode 120000 build/pkgs/sage_setup_docbuild/src/VERSION.txt diff --git a/build/pkgs/sage_setup_docbuild/src/MANIFEST.in b/build/pkgs/sage_setup_docbuild/src/MANIFEST.in new file mode 100644 index 00000000000..74282fceee2 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/MANIFEST.in @@ -0,0 +1 @@ +include VERSION.txt diff --git a/build/pkgs/sage_setup_docbuild/src/VERSION.txt b/build/pkgs/sage_setup_docbuild/src/VERSION.txt new file mode 120000 index 00000000000..9207ddd5144 --- /dev/null +++ b/build/pkgs/sage_setup_docbuild/src/VERSION.txt @@ -0,0 +1 @@ +../package-version.txt \ No newline at end of file diff --git a/build/pkgs/sage_setup_docbuild/src/setup.cfg b/build/pkgs/sage_setup_docbuild/src/setup.cfg index e35edbad114..14787491d17 100644 --- a/build/pkgs/sage_setup_docbuild/src/setup.cfg +++ b/build/pkgs/sage_setup_docbuild/src/setup.cfg @@ -1,5 +1,6 @@ [metadata] name = sage_setup.docbuild +version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Build system of the Sage documentation long_description = file: README.md license = GNU General Public License (GPL) v2 or later From 5e8a483b63ace6a0ff7535f559a8da794ad4faed Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 20 Jul 2020 15:37:37 -0700 Subject: [PATCH 04/18] build/pkgs/sage_setup_docbuild/spkg-install: Remove useless use of sage-dist-helpers --- build/pkgs/sage_setup_docbuild/spkg-install | 1 - 1 file changed, 1 deletion(-) diff --git a/build/pkgs/sage_setup_docbuild/spkg-install b/build/pkgs/sage_setup_docbuild/spkg-install index 666796dc2cd..acc4173dc92 100755 --- a/build/pkgs/sage_setup_docbuild/spkg-install +++ b/build/pkgs/sage_setup_docbuild/spkg-install @@ -1,6 +1,5 @@ #!/usr/bin/env bash cd src -. sage-dist-helpers # We install directly with setuptools, not with pip, because pip does not handle our symlinks correctly. # An alternative would be to build an sdist and then to install the sdist using pip. sage-python23 -u setup.py --no-user-cfg install --single-version-externally-managed --root=/ From d6587e44eb16d712838735d4f450888d4a2e03e2 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 9 Aug 2020 18:21:32 -0700 Subject: [PATCH 05/18] build/pkgs/sage_setup_docbuild: Make sagelib an order-only dep --- build/pkgs/sage_setup_docbuild/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sage_setup_docbuild/dependencies b/build/pkgs/sage_setup_docbuild/dependencies index 757e8c9f683..20f527f0f16 100644 --- a/build/pkgs/sage_setup_docbuild/dependencies +++ b/build/pkgs/sage_setup_docbuild/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib sphinx six | $(PYTHON_TOOLCHAIN) +$(PYTHON) sphinx six | $(PYTHON_TOOLCHAIN) sagelib From cde7120c9b2ee5825a98e456237e728802af47cf Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 8 Sep 2020 15:50:15 -0700 Subject: [PATCH 06/18] build/pkgs/sage_setup_docbuild/spkg-install: Install via setup.py bdist_wheel --- build/pkgs/sage_setup_docbuild/spkg-install | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sage_setup_docbuild/spkg-install b/build/pkgs/sage_setup_docbuild/spkg-install index acc4173dc92..89803903dd4 100755 --- a/build/pkgs/sage_setup_docbuild/spkg-install +++ b/build/pkgs/sage_setup_docbuild/spkg-install @@ -1,5 +1,14 @@ #!/usr/bin/env bash -cd src -# We install directly with setuptools, not with pip, because pip does not handle our symlinks correctly. -# An alternative would be to build an sdist and then to install the sdist using pip. -sage-python23 -u setup.py --no-user-cfg install --single-version-externally-managed --root=/ +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +# We build the wheel directly with "setup.py bdist_wheel", not with "pip wheel", +# because pip does not handle our symlinks correctly. +cd src && sage-python23 -u setup.py --no-user-cfg bdist_wheel && sdh_store_and_pip_install_wheel . From 7026e29064d4cb1ac7c2b0c4996201ec202eb9ed Mon Sep 17 00:00:00 2001 From: "John H. Palmieri" Date: Tue, 8 Sep 2020 19:32:25 -0700 Subject: [PATCH 07/18] trac 30010: remove six as a dependency of sage_setup_docbuild --- build/pkgs/sage_setup_docbuild/dependencies | 2 +- build/pkgs/sage_setup_docbuild/src/requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/pkgs/sage_setup_docbuild/dependencies b/build/pkgs/sage_setup_docbuild/dependencies index 20f527f0f16..b21990c270b 100644 --- a/build/pkgs/sage_setup_docbuild/dependencies +++ b/build/pkgs/sage_setup_docbuild/dependencies @@ -1 +1 @@ -$(PYTHON) sphinx six | $(PYTHON_TOOLCHAIN) sagelib +$(PYTHON) sphinx | $(PYTHON_TOOLCHAIN) sagelib diff --git a/build/pkgs/sage_setup_docbuild/src/requirements.txt b/build/pkgs/sage_setup_docbuild/src/requirements.txt index 2dedc630e98..4e5dd84d0e8 100644 --- a/build/pkgs/sage_setup_docbuild/src/requirements.txt +++ b/build/pkgs/sage_setup_docbuild/src/requirements.txt @@ -1,3 +1,2 @@ #sage sphinx -six From 07fcfc807f85cd3343f6e53f42c34e1109533388 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 Feb 2021 11:04:16 -0800 Subject: [PATCH 08/18] Move/rename sage_setup.docbuild -> sage_docbuild --- build/bin/sage-site | 2 +- build/make/Makefile.in | 2 +- .../dependencies | 0 .../package-version.txt | 0 .../spkg-install | 0 .../spkg-src | 8 ++--- .../src/MANIFEST.in | 0 .../src/README.md | 2 +- .../src/VERSION.txt | 0 .../src/requirements.txt | 0 build/pkgs/sage_docbuild/src/sage_docbuild | 1 + .../src/setup.cfg | 2 +- .../src/setup.py | 0 .../src/tox.ini | 6 ++-- .../type | 0 .../src/sage_setup/docbuild | 1 - build/pkgs/sagelib/src/MANIFEST.in | 2 +- src/doc/en/developer/sage_manuals.rst | 2 +- .../docbuild => sage_docbuild}/__init__.py | 30 +++++++++---------- .../docbuild => sage_docbuild}/__main__.py | 0 .../build_options.py | 0 .../ext/__init__.py | 0 .../ext/inventory_builder.py | 0 .../ext/multidocs.py | 0 .../ext/sage_autodoc.py | 0 .../docbuild => sage_docbuild}/sphinxbuild.py | 6 ++-- .../docbuild => sage_docbuild}/utils.py | 2 +- 27 files changed, 33 insertions(+), 33 deletions(-) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/dependencies (100%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/package-version.txt (100%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/spkg-install (100%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/spkg-src (55%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/src/MANIFEST.in (100%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/src/README.md (74%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/src/VERSION.txt (100%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/src/requirements.txt (100%) create mode 120000 build/pkgs/sage_docbuild/src/sage_docbuild rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/src/setup.cfg (92%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/src/setup.py (100%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/src/tox.ini (75%) rename build/pkgs/{sage_setup_docbuild => sage_docbuild}/type (100%) delete mode 120000 build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild rename src/{sage_setup/docbuild => sage_docbuild}/__init__.py (98%) rename src/{sage_setup/docbuild => sage_docbuild}/__main__.py (100%) rename src/{sage_setup/docbuild => sage_docbuild}/build_options.py (100%) rename src/{sage_setup/docbuild => sage_docbuild}/ext/__init__.py (100%) rename src/{sage_setup/docbuild => sage_docbuild}/ext/inventory_builder.py (100%) rename src/{sage_setup/docbuild => sage_docbuild}/ext/multidocs.py (100%) rename src/{sage_setup/docbuild => sage_docbuild}/ext/sage_autodoc.py (100%) rename src/{sage_setup/docbuild => sage_docbuild}/sphinxbuild.py (98%) rename src/{sage_setup/docbuild => sage_docbuild}/utils.py (99%) diff --git a/build/bin/sage-site b/build/bin/sage-site index 317a588a8ad..400782164b3 100755 --- a/build/bin/sage-site +++ b/build/bin/sage-site @@ -162,7 +162,7 @@ if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then export OMP_NUM_THREADS=1 fi - exec sage-python -m sage_setup.docbuild "$@" &2 "Error - SAGE_ROOT undefined ... exiting" @@ -15,7 +15,7 @@ fi # Exit on failure set -e -cd build/pkgs/sage_setup_docbuild +cd build/pkgs/sage_docbuild cd src -sage-python23 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sage_setup_docbuild/src/MANIFEST.in b/build/pkgs/sage_docbuild/src/MANIFEST.in similarity index 100% rename from build/pkgs/sage_setup_docbuild/src/MANIFEST.in rename to build/pkgs/sage_docbuild/src/MANIFEST.in diff --git a/build/pkgs/sage_setup_docbuild/src/README.md b/build/pkgs/sage_docbuild/src/README.md similarity index 74% rename from build/pkgs/sage_setup_docbuild/src/README.md rename to build/pkgs/sage_docbuild/src/README.md index bc5466846a9..c020626aab9 100644 --- a/build/pkgs/sage_setup_docbuild/src/README.md +++ b/build/pkgs/sage_docbuild/src/README.md @@ -1,3 +1,3 @@ -# sage_setup.docbuild # +# sage_docbuild # This is the build system of the Sage documentation, based on sphinx. diff --git a/build/pkgs/sage_setup_docbuild/src/VERSION.txt b/build/pkgs/sage_docbuild/src/VERSION.txt similarity index 100% rename from build/pkgs/sage_setup_docbuild/src/VERSION.txt rename to build/pkgs/sage_docbuild/src/VERSION.txt diff --git a/build/pkgs/sage_setup_docbuild/src/requirements.txt b/build/pkgs/sage_docbuild/src/requirements.txt similarity index 100% rename from build/pkgs/sage_setup_docbuild/src/requirements.txt rename to build/pkgs/sage_docbuild/src/requirements.txt diff --git a/build/pkgs/sage_docbuild/src/sage_docbuild b/build/pkgs/sage_docbuild/src/sage_docbuild new file mode 120000 index 00000000000..a9114dd4f0b --- /dev/null +++ b/build/pkgs/sage_docbuild/src/sage_docbuild @@ -0,0 +1 @@ +../../../../src/sage_docbuild \ No newline at end of file diff --git a/build/pkgs/sage_setup_docbuild/src/setup.cfg b/build/pkgs/sage_docbuild/src/setup.cfg similarity index 92% rename from build/pkgs/sage_setup_docbuild/src/setup.cfg rename to build/pkgs/sage_docbuild/src/setup.cfg index 14787491d17..c6d141db3fc 100644 --- a/build/pkgs/sage_setup_docbuild/src/setup.cfg +++ b/build/pkgs/sage_docbuild/src/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = sage_setup.docbuild +name = sage_docbuild version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Build system of the Sage documentation long_description = file: README.md diff --git a/build/pkgs/sage_setup_docbuild/src/setup.py b/build/pkgs/sage_docbuild/src/setup.py similarity index 100% rename from build/pkgs/sage_setup_docbuild/src/setup.py rename to build/pkgs/sage_docbuild/src/setup.py diff --git a/build/pkgs/sage_setup_docbuild/src/tox.ini b/build/pkgs/sage_docbuild/src/tox.ini similarity index 75% rename from build/pkgs/sage_setup_docbuild/src/tox.ini rename to build/pkgs/sage_docbuild/src/tox.ini index 99031e0578b..de900475e2a 100644 --- a/build/pkgs/sage_setup_docbuild/src/tox.ini +++ b/build/pkgs/sage_docbuild/src/tox.ini @@ -4,11 +4,11 @@ # # To build and test in the tox environment: # -# ./sage -sh -c '(cd build/pkgs/sage_setup_docbuild/src && tox)' +# ./sage -sh -c '(cd build/pkgs/sage_docbuild/src && tox)' # # To test interactively: # -# build/pkgs/sage_setup_docbuild/src/.tox/python/bin/python +# build/pkgs/sage_docbuild/src/.tox/python/bin/python # [tox] @@ -24,7 +24,7 @@ whitelist_externals = commands = # Beware of the treacherous non-src layout. - #python -c 'import sys; "" in sys.path and sys.path.remove(""); import sage_setup.docbuild' + #python -c 'import sys; "" in sys.path and sys.path.remove(""); import sage_docbuild' # TODO: Add tests after adding the dependency on sagelib to # requirements.txt diff --git a/build/pkgs/sage_setup_docbuild/type b/build/pkgs/sage_docbuild/type similarity index 100% rename from build/pkgs/sage_setup_docbuild/type rename to build/pkgs/sage_docbuild/type diff --git a/build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild b/build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild deleted file mode 120000 index 8d56bfb043c..00000000000 --- a/build/pkgs/sage_setup_docbuild/src/sage_setup/docbuild +++ /dev/null @@ -1 +0,0 @@ -../../../../../src/sage_setup/docbuild \ No newline at end of file diff --git a/build/pkgs/sagelib/src/MANIFEST.in b/build/pkgs/sagelib/src/MANIFEST.in index f261574e834..e149951fe4e 100644 --- a/build/pkgs/sagelib/src/MANIFEST.in +++ b/build/pkgs/sagelib/src/MANIFEST.in @@ -7,4 +7,4 @@ 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 -prune sage_setup/docbuild # Shipped by sage_setup.docbuild +prune sage_docbuild # Shipped by sage_docbuild diff --git a/src/doc/en/developer/sage_manuals.rst b/src/doc/en/developer/sage_manuals.rst index 38ca69e050d..6482700b0e0 100644 --- a/src/doc/en/developer/sage_manuals.rst +++ b/src/doc/en/developer/sage_manuals.rst @@ -176,7 +176,7 @@ Building the Manuals All of the Sage manuals are built using the ``sage --docbuild`` script. The content of the ``sage --docbuild`` script is defined in -``SAGE_ROOT/src/sage_setup/docbuild/__init__.py``. It is a thin wrapper around +``SAGE_ROOT/src/sage_docbuild/__init__.py``. It is a thin wrapper around the ``sphinx-build`` script which does all of the real work. It is designed to be a replacement for the default Makefiles generated by the ``sphinx-quickstart`` script. The general form of the command diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_docbuild/__init__.py similarity index 98% rename from src/sage_setup/docbuild/__init__.py rename to src/sage_docbuild/__init__.py index b07e9c100cf..5f27d333290 100644 --- a/src/sage_setup/docbuild/__init__.py +++ b/src/sage_docbuild/__init__.py @@ -90,16 +90,16 @@ def builder_helper(type): Check that :trac:`25161` has been resolved:: - sage: from sage_setup.docbuild import DocBuilder, setup_parser + sage: from sage_docbuild import DocBuilder, setup_parser sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set - sage: import sage_setup.docbuild.sphinxbuild + sage: import sage_docbuild.sphinxbuild sage: def raiseBaseException(): ....: raise BaseException("abort pool operation") - sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException + sage: original_runsphinx, sage_docbuild.sphinxbuild.runsphinx = sage_docbuild.sphinxbuild.runsphinx, raiseBaseException - sage: from sage_setup.docbuild import builder_helper, build_ref_doc - sage: from sage_setup.docbuild import _build_many as build_many + sage: from sage_docbuild import builder_helper, build_ref_doc + sage: from sage_docbuild import _build_many as build_many sage: helper = builder_helper("html") sage: try: ....: build_many(build_ref_doc, [("docname", "en", "html", {})]) @@ -180,7 +180,7 @@ def _output_dir(self, type): EXAMPLES:: - sage: from sage_setup.docbuild import DocBuilder + sage: from sage_docbuild import DocBuilder sage: b = DocBuilder('tutorial') sage: b._output_dir('html') '.../html/en/tutorial' @@ -197,7 +197,7 @@ def _doctrees_dir(self): EXAMPLES:: - sage: from sage_setup.docbuild import DocBuilder + sage: from sage_docbuild import DocBuilder sage: b = DocBuilder('tutorial') sage: b._doctrees_dir() '.../doctrees/en/tutorial' @@ -212,7 +212,7 @@ def _output_formats(self): EXAMPLES:: - sage: from sage_setup.docbuild import DocBuilder + sage: from sage_docbuild import DocBuilder sage: b = DocBuilder('tutorial') sage: b._output_formats() ['changes', 'html', 'htmlhelp', 'inventory', 'json', 'latex', 'linkcheck', 'pickle', 'web'] @@ -236,7 +236,7 @@ def pdf(self): EXAMPLES:: - sage: from sage_setup.docbuild import DocBuilder + sage: from sage_docbuild import DocBuilder sage: b = DocBuilder('tutorial') sage: b.pdf() #not tested """ @@ -288,7 +288,7 @@ def clean(self, *args): def build_many(target, args): """ - Thin wrapper around `sage_setup.docbuild.utils.build_many` which uses the + Thin wrapper around `sage_docbuild.utils.build_many` which uses the docbuild settings ``NUM_THREADS`` and ``ABORT_ON_ERROR``. """ try: @@ -361,7 +361,7 @@ def get_all_documents(self): EXAMPLES:: - sage: from sage_setup.docbuild import AllBuilder + sage: from sage_docbuild import AllBuilder sage: documents = AllBuilder().get_all_documents() sage: 'en/tutorial' in documents True @@ -517,7 +517,7 @@ def _output_dir(self, type, lang='en'): EXAMPLES:: - sage: from sage_setup.docbuild import ReferenceBuilder + sage: from sage_docbuild import ReferenceBuilder sage: b = ReferenceBuilder('reference') sage: b._output_dir('html') '.../html/en/reference' @@ -680,7 +680,7 @@ def get_all_documents(self, refdir): EXAMPLES:: - sage: from sage_setup.docbuild import ReferenceBuilder + sage: from sage_docbuild import ReferenceBuilder sage: b = ReferenceBuilder('reference') sage: refdir = os.path.join(os.environ['SAGE_DOC_SRC'], 'en', b.name) sage: sorted(b.get_all_documents(refdir)) @@ -1038,7 +1038,7 @@ def auto_rest_filename(self, module_name): EXAMPLES:: - sage: from sage_setup.docbuild import ReferenceSubBuilder + sage: from sage_docbuild import ReferenceSubBuilder sage: ReferenceSubBuilder("reference").auto_rest_filename("sage.combinat.partition") '.../doc/en/reference/sage/combinat/partition.rst' """ @@ -1584,7 +1584,7 @@ def setup_logger(verbose=1, color=True): EXAMPLES:: - sage: from sage_setup.docbuild import setup_logger, logger + sage: from sage_docbuild import setup_logger, logger sage: setup_logger() sage: type(logger) diff --git a/src/sage_setup/docbuild/__main__.py b/src/sage_docbuild/__main__.py similarity index 100% rename from src/sage_setup/docbuild/__main__.py rename to src/sage_docbuild/__main__.py diff --git a/src/sage_setup/docbuild/build_options.py b/src/sage_docbuild/build_options.py similarity index 100% rename from src/sage_setup/docbuild/build_options.py rename to src/sage_docbuild/build_options.py diff --git a/src/sage_setup/docbuild/ext/__init__.py b/src/sage_docbuild/ext/__init__.py similarity index 100% rename from src/sage_setup/docbuild/ext/__init__.py rename to src/sage_docbuild/ext/__init__.py diff --git a/src/sage_setup/docbuild/ext/inventory_builder.py b/src/sage_docbuild/ext/inventory_builder.py similarity index 100% rename from src/sage_setup/docbuild/ext/inventory_builder.py rename to src/sage_docbuild/ext/inventory_builder.py diff --git a/src/sage_setup/docbuild/ext/multidocs.py b/src/sage_docbuild/ext/multidocs.py similarity index 100% rename from src/sage_setup/docbuild/ext/multidocs.py rename to src/sage_docbuild/ext/multidocs.py diff --git a/src/sage_setup/docbuild/ext/sage_autodoc.py b/src/sage_docbuild/ext/sage_autodoc.py similarity index 100% rename from src/sage_setup/docbuild/ext/sage_autodoc.py rename to src/sage_docbuild/ext/sage_autodoc.py diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py similarity index 98% rename from src/sage_setup/docbuild/sphinxbuild.py rename to src/sage_docbuild/sphinxbuild.py index b08ea9b7421..f58f6c61d76 100644 --- a/src/sage_setup/docbuild/sphinxbuild.py +++ b/src/sage_docbuild/sphinxbuild.py @@ -172,7 +172,7 @@ def _check_errors(self, line): EXAMPLES:: sage: from sys import stdout - sage: from sage_setup.docbuild.sphinxbuild import SageSphinxLogger + sage: from sage_docbuild.sphinxbuild import SageSphinxLogger sage: logger = SageSphinxLogger(stdout, "doctesting") sage: logger._log_line("Segmentation fault!\n") # indirect doctest [doctestin] Segmentation fault! @@ -200,7 +200,7 @@ def _log_line(self, line): EXAMPLES:: sage: from sys import stdout - sage: from sage_setup.docbuild.sphinxbuild import SageSphinxLogger + sage: from sage_docbuild.sphinxbuild import SageSphinxLogger sage: logger = SageSphinxLogger(stdout, "doctesting") sage: logger._log_line("building documentation…\n") [doctestin] building documentation… @@ -243,7 +243,7 @@ def raise_errors(self): EXAMPLES:: sage: from sys import stdout - sage: from sage_setup.docbuild.sphinxbuild import SageSphinxLogger + sage: from sage_docbuild.sphinxbuild import SageSphinxLogger sage: logger = SageSphinxLogger(stdout, "doctesting") sage: logger._log_line("This is a SEVERE error\n") [doctestin] This is a SEVERE error diff --git a/src/sage_setup/docbuild/utils.py b/src/sage_docbuild/utils.py similarity index 99% rename from src/sage_setup/docbuild/utils.py rename to src/sage_docbuild/utils.py index 056392ac39e..526d92b9574 100644 --- a/src/sage_setup/docbuild/utils.py +++ b/src/sage_docbuild/utils.py @@ -42,7 +42,7 @@ def build_many(target, args, processes=None): EXAMPLES:: - sage: from sage_setup.docbuild.utils import build_many + sage: from sage_docbuild.utils import build_many sage: def target(N): ....: import time ....: time.sleep(float(0.1)) From c76fea5430f83e40c1b3218395829031fb509e7b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 Feb 2021 11:13:04 -0800 Subject: [PATCH 09/18] src/sage/doctest/control.py: When adding sage_setup, add sage_doctest too --- src/sage/doctest/control.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py index 7d2b84b9c3a..eafcf924de1 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py @@ -697,6 +697,7 @@ def all_files(): # don't make sense to run outside a build environment if have_git: self.files.append(opj(SAGE_SRC, 'sage_setup')) + self.files.append(opj(SAGE_SRC, 'sage_doctest')) self.files.append(SAGE_DOC_SRC) if self.options.all or (self.options.new and not have_git): From c262e44786dd4b7d4f5147cd81d510873e76c86b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 Feb 2021 11:31:37 -0800 Subject: [PATCH 10/18] build/pkgs/sage_docbuild/src: Update metadata --- build/pkgs/sage_docbuild/src/README.md | 3 --- build/pkgs/sage_docbuild/src/README.rst | 23 +++++++++++++++++++++++ build/pkgs/sage_docbuild/src/setup.cfg | 20 ++++++++++++++++++-- 3 files changed, 41 insertions(+), 5 deletions(-) delete mode 100644 build/pkgs/sage_docbuild/src/README.md create mode 100644 build/pkgs/sage_docbuild/src/README.rst diff --git a/build/pkgs/sage_docbuild/src/README.md b/build/pkgs/sage_docbuild/src/README.md deleted file mode 100644 index c020626aab9..00000000000 --- a/build/pkgs/sage_docbuild/src/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# sage_docbuild # - -This is the build system of the Sage documentation, based on sphinx. diff --git a/build/pkgs/sage_docbuild/src/README.rst b/build/pkgs/sage_docbuild/src/README.rst new file mode 100644 index 00000000000..16ed52cdd52 --- /dev/null +++ b/build/pkgs/sage_docbuild/src/README.rst @@ -0,0 +1,23 @@ +================================================================================ + Sage: Open Source Mathematics Software: Build system of the Sage documentation +================================================================================ + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2020 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via Sage-the-distribution (https://www.sagemath.org/download-source.html). Sage-the-distribution first builds a large number of open source packages from source (unless it finds suitable versions installed in the system) and then installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This is the build system of the Sage documentation, based on Sphinx. diff --git a/build/pkgs/sage_docbuild/src/setup.cfg b/build/pkgs/sage_docbuild/src/setup.cfg index c6d141db3fc..f847e686606 100644 --- a/build/pkgs/sage_docbuild/src/setup.cfg +++ b/build/pkgs/sage_docbuild/src/setup.cfg @@ -2,8 +2,24 @@ name = sage_docbuild version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Build system of the Sage documentation -long_description = file: README.md +long_description = file: README.rst +long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later author = The Sage Developers -author_email = https://groups.google.com/group/sage-support +author_email = sage-support@googlegroups.com url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics From 52778c3bf8035a174a296dfc92f7145c96447492 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 Feb 2021 11:46:30 -0800 Subject: [PATCH 11/18] build/pkgs/sage_docbuild/spkg-install: Use sdh_setup_bdist_wheel --- build/pkgs/sage_docbuild/spkg-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sage_docbuild/spkg-install b/build/pkgs/sage_docbuild/spkg-install index 89803903dd4..99a95cf9cd5 100755 --- a/build/pkgs/sage_docbuild/spkg-install +++ b/build/pkgs/sage_docbuild/spkg-install @@ -11,4 +11,4 @@ if [ $? -ne 0 ]; then fi # We build the wheel directly with "setup.py bdist_wheel", not with "pip wheel", # because pip does not handle our symlinks correctly. -cd src && sage-python23 -u setup.py --no-user-cfg bdist_wheel && sdh_store_and_pip_install_wheel . +cd src && sdh_setup_bdist_wheel && sdh_store_and_pip_install_wheel . From b6abe5e15d30a729d24730607ba47331406f244c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 Feb 2021 11:46:56 -0800 Subject: [PATCH 12/18] src/sage/docs/conf.py: Use absolute module names for sage_docbuild extensions --- src/sage/docs/conf.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/sage/docs/conf.py b/src/sage/docs/conf.py index 527c664f84a..742af264502 100644 --- a/src/sage/docs/conf.py +++ b/src/sage/docs/conf.py @@ -12,17 +12,14 @@ import sphinx.ext.intersphinx as intersphinx from IPython.lib.lexers import IPythonConsoleLexer, IPyLexer -# If your extensions are in another directory, add it here. -sys.path.append(os.path.join(SAGE_SRC, "sage_setup", "docbuild", "ext")) - # General configuration # --------------------- # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['inventory_builder', - 'multidocs', - 'sage_autodoc', +extensions = ['sage_docbuild.ext.inventory_builder', + 'sage_docbuild.ext.multidocs', + 'sage_docbuild.ext.sage_autodoc', 'sphinx.ext.graphviz', 'sphinx.ext.inheritance_diagram', 'sphinx.ext.todo', From b42920b7fed686280aed51c9bf8392565297c239 Mon Sep 17 00:00:00 2001 From: "John H. Palmieri" Date: Tue, 23 Feb 2021 11:48:44 -0800 Subject: [PATCH 13/18] trac 30010: (typo) change sage_doctest -> sage_docbuild --- src/sage/doctest/control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py index eafcf924de1..ad6173e616b 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py @@ -697,7 +697,7 @@ def all_files(): # don't make sense to run outside a build environment if have_git: self.files.append(opj(SAGE_SRC, 'sage_setup')) - self.files.append(opj(SAGE_SRC, 'sage_doctest')) + self.files.append(opj(SAGE_SRC, 'sage_docbuild')) self.files.append(SAGE_DOC_SRC) if self.options.all or (self.options.new and not have_git): From 0a472f20758eb2b6e277cdcf59b8db6a58b585b4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 23 Feb 2021 13:17:39 -0800 Subject: [PATCH 14/18] build/pkgs/sage_docbuild/src/setup.py: Restrict find_namespace_packages to sage_docbuild --- build/pkgs/sage_docbuild/src/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sage_docbuild/src/setup.py b/build/pkgs/sage_docbuild/src/setup.py index 120ea63bbbb..36085e4e83d 100644 --- a/build/pkgs/sage_docbuild/src/setup.py +++ b/build/pkgs/sage_docbuild/src/setup.py @@ -3,5 +3,5 @@ from setuptools import setup, find_namespace_packages setup( - packages=find_namespace_packages() + packages=find_namespace_packages(include=['sage_docbuild']) ) From 1dfeb84b5e99dbff354f993b3a762b2218ce23d4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 23 Feb 2021 17:46:21 -0800 Subject: [PATCH 15/18] build/make/Makefile.in (sage_docbuild-clean): New, run it from build-clean --- build/make/Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/make/Makefile.in b/build/make/Makefile.in index a75a0e66d82..b6b66085c52 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -346,7 +346,10 @@ sagelib-clean: @echo "Deleting Sage library build artifacts..." (cd "$(SAGE_SRC)" && rm -rf c_lib .cython_version; rm -rf build; find . -name '*.pyc' | xargs rm -f; rm -rf sage/ext/interpreters) && (cd "$(SAGE_ROOT)/build/pkgs/sagelib/src/" && rm -rf build) -build-clean: clean doc-clean sagelib-clean +sage_docbuild-clean: + (cd "$(SAGE_ROOT)/build/pkgs/sage_docbuild/src" && rm -rf build) + +build-clean: clean doc-clean sagelib-clean sage_docbuild-clean # Special target for cleaning up a broken GCC install detected by configure # This should check for the .clean-broken-gcc stamp, and if found clean From 881c4af5246e462c3e5cb8253a13a79209a885cd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 23 Feb 2021 21:59:09 -0800 Subject: [PATCH 16/18] src/sage_setup/__init__.py: Restore --- src/sage_setup/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/sage_setup/__init__.py diff --git a/src/sage_setup/__init__.py b/src/sage_setup/__init__.py new file mode 100644 index 00000000000..e69de29bb2d From 4eca937ccecf113fb05563af09f753e461effa95 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 24 Feb 2021 10:57:31 -0800 Subject: [PATCH 17/18] build/pkgs/sage_docbuild/src/setup.{cfg,py}: Use an explicit list of packages, add install_requires --- build/pkgs/sage_docbuild/src/setup.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/pkgs/sage_docbuild/src/setup.cfg b/build/pkgs/sage_docbuild/src/setup.cfg index f847e686606..99b54e9c310 100644 --- a/build/pkgs/sage_docbuild/src/setup.cfg +++ b/build/pkgs/sage_docbuild/src/setup.cfg @@ -23,3 +23,11 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: Implementation :: CPython Topic :: Scientific/Engineering :: Mathematics + +[options] +packages = + sage_docbuild + sage_docbuild.ext + +install_requires = + sphinx From aaab1d3713d1bd2afb922466a086f8e85849a02d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 24 Feb 2021 10:57:58 -0800 Subject: [PATCH 18/18] build/pkgs/sage_docbuild/dependencies: Add dependencies on .py files --- build/pkgs/sage_docbuild/dependencies | 2 +- build/pkgs/sage_docbuild/src/setup.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/pkgs/sage_docbuild/dependencies b/build/pkgs/sage_docbuild/dependencies index b21990c270b..d3920d653a9 100644 --- a/build/pkgs/sage_docbuild/dependencies +++ b/build/pkgs/sage_docbuild/dependencies @@ -1 +1 @@ -$(PYTHON) sphinx | $(PYTHON_TOOLCHAIN) sagelib +$(PYTHON) sphinx ../pkgs/sage_docbuild/src/sage_docbuild/*.py ../pkgs/sage_docbuild/src/sage_docbuild/ext/*.py | $(PYTHON_TOOLCHAIN) sagelib diff --git a/build/pkgs/sage_docbuild/src/setup.py b/build/pkgs/sage_docbuild/src/setup.py index 36085e4e83d..beda28e8216 100644 --- a/build/pkgs/sage_docbuild/src/setup.py +++ b/build/pkgs/sage_docbuild/src/setup.py @@ -1,7 +1,5 @@ #!/usr/bin/env python -from setuptools import setup, find_namespace_packages +from setuptools import setup -setup( - packages=find_namespace_packages(include=['sage_docbuild']) -) +setup()