Skip to content

Commit

Permalink
Trac #33115: Re-run bootstrap when an install-requires.txt or package…
Browse files Browse the repository at this point in the history
…-version.txt has changed

Developers may see messages like the following when merging package
upgrade tickets such as #32968.
{{{
Installing collected packages: Sphinx
  changing mode of /home/gitpod/sage-local/var/lib/sage/venv-
python3.8/bin/sphinx-apidoc to 755
  changing mode of /home/gitpod/sage-local/var/lib/sage/venv-
python3.8/bin/sphinx-autogen to 755
  changing mode of /home/gitpod/sage-local/var/lib/sage/venv-
python3.8/bin/sphinx-build to 755
  changing mode of /home/gitpod/sage-local/var/lib/sage/venv-
python3.8/bin/sphinx-quickstart to 755
ERROR: pip's dependency resolver does not currently take into account
all the packages that are installed. This behaviour is the source of the
following dependency conflicts.
sagemath-standard 9.5b9 requires sphinx<4.3,>=4, but you have sphinx
4.3.1 which is incompatible.
Successfully installed Sphinx-4.3.1
}}}
`bootstrap` generates various files (in the above, `src/install-
requires.txt`) from the source files `build/pkgs/*/install-
requires.txt`).
To fix this, we should add these files as dependencies of the
`configure` target in the top-level `Makefile`.

Likewise for the source files `build/pkgs/*/package-version.txt`, which
influence other files such as `src/requirements.txt` that are generated
by `bootstrap`.

URL: https://trac.sagemath.org/33115
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): Michael Orlitzky
  • Loading branch information
Release Manager committed Feb 14, 2022
2 parents 1dda73e + 686fa78 commit 44fb492
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ ptestoptional-nodoc: build
ptestoptionallong-nodoc: build
$(PTESTALL) --long --logfile=logs/ptestoptionallong.log

configure: bootstrap src/doc/bootstrap configure.ac src/bin/sage-version.sh m4/*.m4 build/pkgs/*/spkg-configure.m4 build/pkgs/*/type build/pkgs/*/distros/*.txt
configure: bootstrap src/doc/bootstrap configure.ac src/bin/sage-version.sh m4/*.m4 build/pkgs/*/spkg-configure.m4 build/pkgs/*/type build/pkgs/*/install-requires.txt build/pkgs/*/package-version.txt build/pkgs/*/distros/*.txt
./bootstrap -d

install: all
Expand Down

0 comments on commit 44fb492

Please sign in to comment.