Skip to content

Commit 59ced5e

Browse files
author
Release Manager
committed
gh-37425: Remove mention of patchbot, remove 'make buildbot-python3' <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> - Depends on #37421 <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #37425 Reported by: Matthias Köppe Reviewer(s): Frédéric Chapoton
2 parents fbaec79 + 6704b34 commit 59ced5e

File tree

6 files changed

+4
-42
lines changed

6 files changed

+4
-42
lines changed

Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ reconfigure:
7878
exit 1; \
7979
fi
8080

81-
# This is used to monitor progress towards Python 3 and prevent
82-
# regressions. Should be removed after the full switch to python3.
83-
#
84-
# As of Sage 9.0: keep the build target for backward compatibility,
85-
# but it just runs "make".
86-
buildbot-python3:
87-
$(MAKE)
88-
8981
# Preemptively download all source tarballs of normal packages.
9082
download:
9183
export SAGE_ROOT=$$(pwd) && \
@@ -376,5 +368,5 @@ list:
376368
misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
377369
test check testoptional testall testlong testoptionallong testallong \
378370
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \
379-
buildbot-python3 list \
371+
list \
380372
doc-clean clean sagelib-clean build-clean

src/.relint.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# From https://github.com/sagemath/sage-patchbot/blob/master/sage_patchbot/plugins.py
2-
# (simple pattern-exclusion plugins)
3-
# The patterns have been edited slightly because relint tests the regexp to the whole file,
4-
# whereas the patchbots tests them line by line.
1+
# Simple pattern exclusions
52

63
- name: 'python3: Python3 incompatible code'
74
hint: |

src/bin/sage

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -193,29 +193,6 @@ if [ "$1" = '--nodotsage' ]; then
193193
exit $status
194194
fi
195195

196-
# Check for '--patchbot' before sourcing sage-env: patchbot needs
197-
# an unclobbered environment before testing unsafe tickets.
198-
if [ "$1" = '-patchbot' -o "$1" = "--patchbot" ]; then
199-
shift
200-
# We ask the Python from Sage where the patchbot is installed.
201-
# We set PYTHONPATH to that directory such that the system Python
202-
# should also find the sage_patchbot package.
203-
cmd='import sage_patchbot as p; import os; print(os.path.dirname(p.__path__[0]))'
204-
export PYTHONPATH=`"$SAGE_ROOT/sage" --python3 -c "$cmd"`
205-
if [ -z "$PYTHONPATH" ]; then
206-
# Something went wrong, assume that the patchbot is not installed
207-
echo >&2 "Error: cannot find installation path for sage_patchbot"
208-
echo >&2 "See https://wiki.sagemath.org/buildbot for instructions"
209-
exit 1
210-
fi
211-
212-
shopt -s execfail # Do not exit if "exec" fails
213-
exec python3 -m sage_patchbot.patchbot "$@"
214-
echo >&2 "Error: cannot find a suitable Python 3 program."
215-
echo >&2 "The SageMath patchbot requires a system Python 3 installation."
216-
exit 127
217-
fi
218-
219196
# build_sage, sage -b, sage -br, etc. could also be moved to
220197
# build/bin/sage-site. See #29111; but OTOH #34627.
221198

src/doc/en/developer/tools.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ available::
5858
(same as "sage --startuptime")
5959
pycodestyle-minimal -- check against Sage's minimal style conventions
6060
relint -- check whether some forbidden patterns appear
61-
(includes all patchbot pattern-exclusion plugins)
6261
codespell -- check for misspelled words in source code
6362
rst -- validate Python docstrings markup as reStructuredText
6463
coverage.py -- run the Sage doctester with Coverage.py
@@ -180,9 +179,7 @@ As of Sage 9.5, the entire Sage library conforms to this configuration::
180179
congratulations :)
181180

182181
When preparing a branch for a Sage ticket, developers should verify that ``./sage -tox -e
183-
pycodestyle-minimal`` passes. When the Sage patchbot runs on the ticket, it will perform similar
184-
coding style checks; but running the check locally reduces the turnaround time from hours
185-
to seconds.
182+
pycodestyle-minimal`` passes.
186183

187184
The second configuration is used with the command ``./sage -tox -e pycodestyle`` and runs a
188185
more thorough check::

src/tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ statistics = True
172172
[testenv:relint]
173173
description =
174174
check whether some forbidden patterns appear
175-
(includes all patchbot pattern-exclusion plugins)
176175
# https://github.com/codingjoe/relint
177176
# The patterns are in .relint.yml
178177
deps = relint

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ allowlist_externals = {[sage_src]allowlist_externals}
10331033
10341034
[testenv:relint]
10351035
description =
1036-
check whether some forbidden patterns appear - similar to patchbot plugins
1036+
check whether some forbidden patterns appear
10371037
passenv = {[sage_src]passenv}
10381038
envdir = {[sage_src]envdir}
10391039
commands = {[sage_src]commands}

0 commit comments

Comments
 (0)