Skip to content

Commit

Permalink
A few manual fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
roed314 committed Feb 9, 2023
1 parent f5f6b87 commit d23dca2
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ build/bin/sage-build-env-config
/pkgs/sagemath-repl/requirements.txt
/pkgs/sagemath-categories/MANIFEST.in

# same for old locations - before Trac #31577
# same for old locations - before Issue #31577
/build/pkgs/*/src/build
/build/pkgs/*/src/dist
/build/pkgs/*/src/MANIFEST
Expand Down
6 changes: 3 additions & 3 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [y
done
# --enable-SPKG options
for pkgname in $(sage-package list :optional: :experimental: | sort); do
# Trac #29629: Temporary solution for Sage 9.1: Do not provide
# Issue #29629: Temporary solution for Sage 9.1: Do not provide
# --enable-SPKG options for installing pip packages
if [ ! -f build/pkgs/$pkgname/requirements.txt ]; then
pkgtype="$(cat build/pkgs/$pkgname/type)"
# Trac #29124: Do not provide --enable-_recommended and similar
# Issue #29124: Do not provide --enable-_recommended and similar
case "$pkgname" in
_*) ;;
*) spkg_configures="$spkg_configures
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])"
if [ -f build/pkgs/$pkgname/spkg-install -o -f build/pkgs/$pkgname/spkg-install.in ]; then
# Trac #31163: Not just an optional dummy package
# Issue #31163: Not just an optional dummy package
spkg_configures="$spkg_configures
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(grep -v ^= build/pkgs/$pkgname/SPKG.rst | head -n1 2>/dev/null || echo $pkgname)])"
fi
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/glpk/spkg-install.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cd src/

# Use newer version of config.guess and config.sub (see Trac #19713)
# Use newer version of config.guess and config.sub (see Github issue #19713)
cp "$SAGE_ROOT"/config/config.* .

# Note: The following doesn't work with spaces in `$SAGE_LOCAL`, but we don't
Expand Down
2 changes: 1 addition & 1 deletion src/sage/misc/superseded.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def _check_issue_number(issue_number):
Traceback (most recent call last):
...
ValueError: 0 is not a valid github issue number
sage: _vcheck_issue_number(int(10))
sage: _check_issue_number(int(10))
sage: _check_issue_number(10.0)
Traceback (most recent call last):
...
Expand Down
2 changes: 1 addition & 1 deletion src/sage/rings/polynomial/term_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ def __setstate__(self, dict):
"""
Translate old pickled TermOrder objects.
See Trac :trac:`11316`.
See Issue :issue:`11316`.
EXAMPLES::
Expand Down

0 comments on commit d23dca2

Please sign in to comment.