Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/write-dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ FROM with-system-packages AS bootstrapped
RUN rm -rf /new /sage/.git
$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap conftest.py configure_wrapper configure.ac sage .homebrew-build-env tox.ini .gitignore pyproject.toml meson.build meson.options /new/
$ADD config/config.rpath /new/config/config.rpath
$ADD src/doc/bootstrap /new/src/doc/bootstrap
$ADD src/meson.build /new/src/
$ADD src/bin /new/src/bin
$ADD m4 /new/m4
Expand All @@ -288,8 +287,8 @@ $ADD tools /new/tools
$ADD .github/workflows /.github/workflows
RUN if [ -d /sage ]; then \\
echo "### Incremental build from \$(cat /sage/VERSION.txt)" && \\
printf '/src/*\n!/src/doc/bootstrap\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/VERSION.txt\n' >> /sage/.gitignore && \\
printf '/src/*\n!/src/doc/bootstrap\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/VERSION.txt\n' >> /new/.gitignore && \\
printf '/src/*\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/VERSION.txt\n' >> /sage/.gitignore && \\
printf '/src/*\n\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/VERSION.txt\n' >> /new/.gitignore && \\
if ! (cd /new && /.github/workflows/retrofit-worktree.sh worktree-image /sage); then \\
echo "retrofit-worktree.sh failed, falling back to replacing /sage"; \\
for a in local logs; do \\
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -364,14 +364,14 @@ CONFIGURE_DEPENDENCIES = \
build/pkgs/*/spkg-install build/pkgs/*/spkg-install.in

# SPKG_INFO_DEPENDENCIES is the list of files that influence the run of 'sage-spkg-info' and hence
# the generation of the files generated in 'src/doc' by 'src/doc/bootstrap'.
# the generation of the files generated 'tools/bootstrap-docs.py'.
SPKG_INFO_DEPENDENCIES = \
build/pkgs/*/type build/pkgs/*/SPKG.rst \
build/pkgs/*/requirements.txt \
build/pkgs/*/version_requirements.txt build/pkgs/*/package-version.txt \
build/pkgs/*/distros/*.txt

configure: bootstrap src/doc/bootstrap $(CONFIGURE_DEPENDENCIES) $(SPKG_INFO_DEPENDENCIES)
configure: bootstrap tools/bootstrap-docs.py $(CONFIGURE_DEPENDENCIES) $(SPKG_INFO_DEPENDENCIES)
./bootstrap -d

install: all
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/sage_docbuild/dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sphinx $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/*.py $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/ext/*.py | $(PYTHON_TOOLCHAIN) sagelib $(PYTHON)
sphinx | $(PYTHON_TOOLCHAIN) sagelib $(PYTHON)
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/internal/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN) $(PYTHON)
cython pkgconfig jinja2 | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
20 changes: 10 additions & 10 deletions build/sage_bootstrap/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@
# ****************************************************************************


import logging
import os
import re
import logging

log = logging.getLogger()

from collections import defaultdict

from sage_bootstrap.package import Package
from sage_bootstrap.tarball import Tarball, FileNotMirroredError
from sage_bootstrap.updater import ChecksumUpdater, PackageUpdater
from sage_bootstrap.creator import PackageCreator
from sage_bootstrap.pypi import PyPiVersion, PyPiNotFound, PyPiError
from sage_bootstrap.fileserver import FileServer
from sage_bootstrap.expand_class import PackageClass
from sage_bootstrap.env import SAGE_DISTFILES

from sage_bootstrap.expand_class import PackageClass
from sage_bootstrap.fileserver import FileServer
from sage_bootstrap.package import Package
from sage_bootstrap.pypi import PyPiError, PyPiNotFound, PyPiVersion
from sage_bootstrap.tarball import FileNotMirroredError, Tarball
from sage_bootstrap.updater import ChecksumUpdater, PackageUpdater

# Approximation of https://peps.python.org/pep-0508/#names dependency specification
dep_re = re.compile('^ *([-A-Z0-9._]+)', re.IGNORECASE)
Expand Down Expand Up @@ -181,7 +181,7 @@ def dependencies(self, *package_classes, **kwds):
# Dependencies like $(BLAS)
print(indent2 + "- {0}".format(dep))
elif format == 'rst' and Package(dep).has_file('SPKG.rst'):
# This RST label is set in src/doc/bootstrap
# This RST label is set in tools/bootstrap-docs.py
print(indent2 + "- :ref:`spkg_{0}`".format(dep))
else:
print(indent2 + "- {0}".format(dep))
Expand Down Expand Up @@ -220,7 +220,7 @@ def apropos(self, incorrect_name):
Did you mean: cython, ipython, python2, python3, patch?
"""
log.debug('Apropos for %s', incorrect_name)
from sage_bootstrap.levenshtein import Levenshtein, DistanceExceeded
from sage_bootstrap.levenshtein import DistanceExceeded, Levenshtein
levenshtein = Levenshtein(5)
names = []
for pkg in Package.all():
Expand Down
Loading
Loading