From 2b555fc1f07bee8b066a6d7da727e516f37e8e34 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sun, 28 Oct 2018 01:29:00 -0400 Subject: bpo-35088: Update idlelib.help.copy_string docstring (#10164) We now use git and backporting instead of hg and forward merging. --- Lib/idlelib/help.py | 34 +++++++++++----------- .../IDLE/2018-10-28-00-54-32.bpo-35088.r1lJZd.rst | 2 ++ 2 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 Misc/NEWS.d/next/IDLE/2018-10-28-00-54-32.bpo-35088.r1lJZd.rst diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py index ae991ee..0603ede 100644 --- a/Lib/idlelib/help.py +++ b/Lib/idlelib/help.py @@ -240,28 +240,28 @@ class HelpWindow(Toplevel): def copy_strip(): """Copy idle.html to idlelib/help.html, stripping trailing whitespace. - Files with trailing whitespace cannot be pushed to the hg cpython + Files with trailing whitespace cannot be pushed to the git cpython repository. For 3.x (on Windows), help.html is generated, after - editing idle.rst in the earliest maintenance version, with + editing idle.rst on the master branch, with sphinx-build -bhtml . build/html python_d.exe -c "from idlelib.help import copy_strip; copy_strip()" - After refreshing TortoiseHG workshop to generate a diff, - check both the diff and displayed text. Push the diff along with - the idle.rst change and merge both into default (or an intermediate - maintenance version). - - When the 'earlist' version gets its final maintenance release, - do an update as described above, without editing idle.rst, to - rebase help.html on the next version of idle.rst. Do not worry - about version changes as version is not displayed. Examine other - changes and the result of Help -> IDLE Help. - - If maintenance and default versions of idle.rst diverge, and - merging does not go smoothly, then consider generating - separate help.html files from separate idle.htmls. + Check build/html/library/idle.html, the help.html diff, and the text + displayed by Help => IDLE Help. Add a blurb and create a PR. + + It can be worthwhile to occasionally generate help.html without + touching idle.rst. Changes to the master version and to the doc + build system may result in changes that should not changed + the displayed text, but might break HelpParser. + + As long as master and maintenance versions of idle.rst remain the + same, help.html can be backported. The internal Python version + number is not displayed. If maintenance idle.rst diverges from + the master version, then instead of backporting help.html from + master, repeat the proceedure above to generate a maintenance + version. """ src = join(abspath(dirname(dirname(dirname(__file__)))), - 'Doc', 'build', 'html', 'library', 'idle.html') + 'Doc', 'build', 'html', 'library', 'idle.html') dst = join(abspath(dirname(__file__)), 'help.html') with open(src, 'rb') as inn,\ open(dst, 'wb') as out: diff --git a/Misc/NEWS.d/next/IDLE/2018-10-28-00-54-32.bpo-35088.r1lJZd.rst b/Misc/NEWS.d/next/IDLE/2018-10-28-00-54-32.bpo-35088.r1lJZd.rst new file mode 100644 index 0000000..993ff51 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-10-28-00-54-32.bpo-35088.r1lJZd.rst @@ -0,0 +1,2 @@ +Update idlelib.help.copy_string docstring. We now use git and backporting +instead of hg and forward merging. -- cgit v0.12