← 返回首页
Trim trailing whitespace and test on CI by hugovk · Pull Request #104275 · python/cpython · GitHub
Skip to content

Navigation Menu

Toggle navigation
Sign in
Appearance settings
Search or jump to...

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Resetting focus

Trim trailing whitespace and test on CI#104275

Merged
hugovk merged 4 commits into
python:mainfrom
hugovk:pre-commit
May 8, 2023
Merged

Trim trailing whitespace and test on CI#104275
hugovk merged 4 commits into
python:mainfrom
hugovk:pre-commit

Conversation

hugovk commented May 7, 2023
edited
Loading

Copy link
Copy Markdown
Member

Fixes python/core-workflow#429.

Follow on from #102531.

Copy link
Copy Markdown
Contributor

Nice, I like this.

terryjreedy left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

Will this check for missing \n or multiple \ns at the end of a file?

Comment thread .github/CODEOWNERS Outdated Show resolved Hide resolved

Copy link
Copy Markdown
Member

Will this check for missing \n or multiple \ns at the end of a file?

No, but if we also added the end-of-file-fixer hook, that would perform that check. I'd be in favour of adding that hook!

https://github.com/pre-commit/pre-commit-hooks#end-of-file-fixer

ezio-melotti left a comment
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

The PR looks ok, but doesn't patchcheck already check for trailing whitespace?

Are these old files that haven't been touched since patchcheck was added so they never got fixed (iirc patchcheck only checks modified files)?

terryjreedy commented May 8, 2023
edited
Loading

Copy link
Copy Markdown
Member

According to the experiment I just ran, patchcheck does not notice or fix end-of-file issues. To be clear, I think that they should be fixed. Currently, GH comments on missing \n but does not fix.

I believe this is meant to eventually replace the patchcheck that is part of the non-required Pipelines run.

hugovk commented May 8, 2023

Copy link
Copy Markdown
Member Author

Will this check for missing \n or multiple \ns at the end of a file?

No, but if we also added the end-of-file-fixer hook, that would perform that check. I'd be in favour of adding that hook!

pre-commit/pre-commit-hooks#end-of-file-fixer

That fixes 524 files...

Details
$ pre-commit run --all-files check yaml...............................................................Passed fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing PCbuild/_asyncio.vcxproj.filters Fixing Lib/test/cjkencodings/euc_jp.txt Fixing Doc/tools/templates/search.html Fixing Doc/library/shelve.rst Fixing Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nPrefixQname.xml Fixing PCbuild/_sqlite3.vcxproj.filters Fixing Lib/test/xmltestdata/c14n-20/c14nComment.xml Fixing Modules/unicodedata_db.h Fixing Lib/test/decimaltestdata/dqMax.decTest Fixing Python/suggestions.c Fixing Tools/msi/exe/exe_d.wixproj Fixing Doc/howto/urllib2.rst Fixing Lib/test/xmltestdata/c14n-20/c14nDefault.xml Fixing Include/pyexpat.h Fixing Doc/whatsnew/2.5.rst Fixing Lib/test/decimaltestdata/rounding.decTest Fixing PCbuild/tk.vcxproj Fixing Lib/test/decimaltestdata/inexact.decTest Fixing Doc/library/termios.rst Fixing Doc/whatsnew/2.2.rst Fixing Lib/test/test_tomllib/data/valid/hex-char.toml Fixing Modules/_hacl/Hacl_Hash_MD5.c Fixing Tools/buildbot/buildmsi.bat Fixing Lib/test/cjkencodings/big5-utf8.txt Fixing Lib/test/decimaltestdata/dqCopySign.decTest Fixing Objects/stringlib/find_max_char.h Fixing Lib/test/test_email/data/msg_22.txt Fixing Lib/test/cjkencodings/shift_jis.txt Fixing Lib/test/xmltestdata/c14n-20/c14nQnameXpathElem.xml Fixing Lib/test/test_tomllib/data/invalid/boolean/invalid-true-casing.toml Fixing Objects/stringlib/partition.h Fixing Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nDefault.xml Fixing Lib/test/decimaltestdata/tointegral.decTest Fixing Lib/test/xmltestdata/c14n-20/out_inNsSuperfluous_c14nPrefix.xml Fixing PCbuild/_ctypes.vcxproj.filters Fixing Doc/tutorial/whatnow.rst Fixing Mac/BuildScript/scripts/postflight.documentation Fixing Doc/library/filecmp.rst Fixing Lib/test/test_email/data/msg_36.txt Fixing Lib/test/decimaltestdata/dqMultiply.decTest Fixing PCbuild/_queue.vcxproj.filters Fixing Lib/test/decimaltestdata/dqToIntegral.decTest Fixing Lib/test/test_tomllib/data/invalid/multiline-literal-str/file-ends-after-opening.toml Fixing Tools/msi/appendpath/appendpath.wxs Fixing Lib/test/decimaltestdata/ddDivide.decTest Fixing Lib/test/xmltestdata/c14n-20/world.txt Fixing Lib/test/decimaltestdata/decQuad.decTest Fixing Tools/msi/sdktools.psm1 Fixing Tools/stringbench/README Fixing Python/symtable.c Fixing PCbuild/tcl.vcxproj Fixing Tools/msi/bundle/packagegroups/dev.wxs Fixing PCbuild/_ctypes_test.vcxproj Fixing Lib/test/test_email/data/msg_25.txt Fixing Lib/test/test_tomllib/data/invalid/inline-table/define-twice-in-subtable.toml Fixing PC/icons/launcher.svg Fixing Doc/library/mailcap.rst Fixing Misc/coverity_model.c Fixing Lib/test/keycert.passwd.pem Fixing Lib/test/xmltestdata/test.xml.out Fixing Tools/msi/tcltk/tcltk_pdb.wixproj Fixing Modules/_blake2/impl/blake2.h Fixing Lib/test/decimaltestdata/dqRemainderNear.decTest Fixing Doc/library/imghdr.rst Fixing Modules/_decimal/libmpdec/examples/compare.c Fixing Doc/library/xml.sax.reader.rst Fixing Modules/_testbuffer.c Fixing PC/pyshellext.cpp Fixing Lib/test/xmltestdata/c14n-20/out_inNsPushdown_c14nPrefix.xml Fixing Python/traceback.c Fixing Doc/library/stringprep.rst Fixing Tools/msi/doc/doc.wixproj Fixing Lib/test/decimaltestdata/logb.decTest Fixing Lib/test/test_tkinter/README Fixing PC/icons/pyc.svg Fixing PC/store_info.txt Fixing PCbuild/pywlauncher.vcxproj.filters Fixing PCbuild/_testconsole.vcxproj Fixing Modules/_decimal/libmpdec/examples/shift.c Fixing Tools/msi/bundle/packagegroups/tcltk.wxs Fixing Lib/test/test_tomllib/data/invalid/keys-and-vals/ends-early-table-def.toml Fixing PCbuild/venvlauncher.vcxproj.filters Fixing Lib/test/xmltestdata/c14n-20/out_inC14N5_c14nTrim.xml Fixing PCbuild/build.bat Fixing Lib/test/test_tomllib/data/invalid/dotted-keys/access-non-table.toml Fixing Tools/msi/lib/lib_d.wixproj Fixing PCbuild/pythonw.vcxproj Fixing PCbuild/_tkinter.vcxproj.filters Fixing Modules/_blake2/impl/blake2b-ref.c Fixing Objects/stringlib/ucs4lib.h Fixing Tools/msi/tcltk/tcltk_d.wixproj Fixing Doc/library/heapq.rst Fixing Modules/_blake2/impl/blake2s-load-sse41.h Fixing Lib/test/tokenize_tests.txt Fixing Modules/_decimal/libmpdec/examples/div.c Fixing Lib/test/cjkencodings/euc_jp-utf8.txt Fixing PCbuild/_socket.vcxproj.filters Fixing Lib/test/decimaltestdata/class.decTest Fixing Doc/c-api/objbuffer.rst Fixing Doc/library/array.rst Fixing Lib/test/decimaltestdata/ddNextToward.decTest Fixing Lib/test/decimaltestdata/ddNextMinus.decTest Fixing PC/pylauncher.rc Fixing PCbuild/_testbuffer.vcxproj Fixing Lib/test/decimaltestdata/base.decTest Fixing Tools/msi/lib/lib_pdb.wixproj Fixing Lib/test/test_tomllib/data/invalid/multiline-basic-str/file-ends-after-opening.toml Fixing PCbuild/_msi.vcxproj Fixing Lib/test/decimaltestdata/ddScaleB.decTest Fixing Modules/_decimal/README.txt Fixing Mac/BuildScript/resources/Conclusion.rtf Fixing Lib/test/test_tomllib/data/invalid/inline-table/overwrite-value-in-inner-table.toml Fixing Objects/exceptions.c Fixing Lib/test/xmltestdata/c14n-20/out_inNsSort_c14nDefault.xml Fixing Lib/test/xmltestdata/c14n-20/out_inC14N5_c14nDefault.xml Fixing Lib/test/xmltestdata/c14n-20/out_inC14N2_c14nDefault.xml Fixing Lib/test/decimaltestdata/decDouble.decTest Fixing Modules/_testimportmultiple.c Fixing Doc/library/chunk.rst Fixing Lib/test/decimaltestdata/dqMaxMag.decTest Fixing Lib/test/test_tomllib/data/invalid/multiline-basic-str/carriage-return.toml Fixing Lib/test/xmltestdata/c14n-20/out_inNsSort_c14nPrefix.xml Fixing Tools/msi/msi.props Fixing Objects/stringlib/split.h Fixing Python/pyctype.c Fixing Lib/test/test_tomllib/data/invalid/keys-and-vals/no-value.toml Fixing PCbuild/python3dll.vcxproj.filters Fixing Modules/_decimal/libmpdec/literature/bignum.txt Fixing Objects/bytesobject.c Fixing Tools/msi/pip/pip.wxs Fixing Modules/cjkcodecs/mappings_tw.h Fixing PCbuild/pythonw_uwp.vcxproj.filters Fixing Doc/copyright.rst Fixing Tools/msi/bundle/full.wixproj Fixing Doc/howto/sockets.rst Fixing Tools/msi/bundle/packagegroups/packageinstall.wxs Fixing PCbuild/unicodedata.vcxproj Fixing Modules/_decimal/tests/README.txt Fixing Objects/stringlib/fastsearch.h Fixing Lib/test/cjkencodings/johab-utf8.txt Fixing Modules/_blake2/impl/blake2b-load-sse2.h Fixing Doc/tutorial/stdlib2.rst Fixing Lib/test/cjkencodings/cp949.txt Fixing Tools/freeze/test/Makefile Fixing Doc/library/turtle-star.ps Fixing PC/icons/pyd.svg Fixing Lib/test/decimaltestdata/nextplus.decTest Fixing Tools/msi/README.txt Fixing Lib/test/randv2_32.pck Fixing Lib/test/test_tomllib/data/invalid/inline-table/overwrite-value-in-inner-array.toml Fixing Tools/msi/test/test_pdb.wixproj Fixing Lib/test/test_tomllib/data/invalid/multiline-literal-str/unclosed.toml Fixing PCbuild/pyshellext.vcxproj.filters Fixing PCbuild/openssl.vcxproj Fixing PCbuild/libffi.props Fixing Modules/_blake2/impl/blake2s.c Fixing Lib/test/decimaltestdata/copysign.decTest Fixing Doc/library/zipapp.rst Fixing Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nTrim.xml Fixing Lib/test/xmltestdata/c14n-20/c14nPrefix.xml Fixing Doc/library/curses.panel.rst Fixing Modules/_decimal/libmpdec/literature/REFERENCES.txt Fixing Lib/test/test_tomllib/data/invalid/basic-str-ends-in-escape.toml Fixing Lib/test/test_tomllib/data/invalid/keys-and-vals/only-ws-after-dot.toml Fixing Doc/c-api/init.rst Fixing PCbuild/_bz2.vcxproj.filters Fixing Doc/library/xdrlib.rst Fixing Lib/test/xmltestdata/c14n-20/out_inC14N4_c14nDefault.xml Fixing Modules/_blake2/impl/blake2b-round.h Fixing Lib/test/test_tomllib/data/invalid/inline-table/mutate.toml Fixing Modules/_blake2/impl/blake2s-ref.c Fixing Tools/msi/core/core_pdb.wixproj Fixing Modules/expat/pyexpatns.h Fixing Lib/test/coding20731.py Fixing Tools/msi/lib/lib.wixproj Fixing Doc/library/uuid.rst Fixing Lib/test/decimaltestdata/testall.decTest Fixing Modules/hashlib.h Fixing Doc/library/tty.rst Fixing Mac/BuildScript/resources/ReadMe.rtf Fixing Doc/library/logging.handlers.rst Fixing Modules/_decimal/libmpdec/examples/pow.c Fixing Modules/_hacl/Hacl_Hash_SHA1.c Fixing PCbuild/_ctypes_test.vcxproj.filters Fixing Lib/test/decimaltestdata/dqSameQuantum.decTest Fixing PCbuild/pyshellext.vcxproj Fixing Lib/test/cjkencodings/gb18030.txt Fixing Lib/test/test_email/data/msg_02.txt Fixing Modules/_decimal/libmpdec/literature/mulmod-64.txt Fixing Doc/library/xml.dom.rst Fixing Lib/test/cjkencodings/gbk.txt Fixing Doc/c-api/allocation.rst Fixing Lib/test/test_email/data/msg_18.txt Fixing Modules/_sha3/sha3.h Fixing PC/icons/python.svg Fixing Python/ceval_gil.c Fixing Lib/test/decimaltestdata/ddBase.decTest Fixing PCbuild/pyexpat.vcxproj.filters Fixing .github/problem-matchers/sphinx.json Fixing PCbuild/_testinternalcapi.vcxproj.filters Fixing PCbuild/_testembed.vcxproj.filters Fixing Doc/library/copy.rst Fixing Mac/IDLE/IDLE.app/Contents/PkgInfo Fixing PCbuild/_multiprocessing.vcxproj Fixing Lib/test/decimaltestdata/nextminus.decTest Fixing Lib/test/randv3.pck Fixing Modules/_decimal/libmpdec/examples/sqrt.c Fixing Mac/PythonLauncher/English.lproj/Credits.rtf Fixing Tools/msi/bundle/packagegroups/exe.wxs Fixing Lib/test/xmltestdata/c14n-20/out_inC14N6_c14nDefault.xml Fixing Lib/test/decimaltestdata/ddRemainderNear.decTest Fixing Lib/test/decimaltestdata/ddMultiply.decTest Fixing PCbuild/_testcapi.vcxproj.filters Fixing Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nPrefix.xml Fixing PCbuild/prepare_libffi.bat Fixing Lib/test/decimaltestdata/ddEncode.decTest Fixing Mac/PythonLauncher/English.lproj/MainMenu.nib/classes.nib Fixing Doc/library/base64.rst Fixing Lib/test/xmltestdata/c14n-20/out_inC14N2_c14nTrim.xml Fixing Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nQnameElem.xml Fixing Lib/test/decimaltestdata/minus.decTest Fixing Lib/test/xmltestdata/c14n-20/c14nPrefixQnameXpathElem.xml Fixing Tools/msi/pip/pip.wixproj Fixing PCbuild/sqlite3.vcxproj.filters Fixing Lib/test/xmltestdata/c14n-20/out_inNsPushdown_c14nDefault.xml Fixing Lib/test/decimaltestdata/dqClass.decTest Fixing Lib/test/test_difflib_expect.html Fixing Lib/test/decimaltestdata/ddCanonical.decTest Fixing Lib/test/test_tomllib/data/invalid/multiline-basic-str/unclosed-ends-in-whitespace-escape.toml Fixing Programs/_bootstrap_python.c Fixing Include/py_curses.h Fixing Lib/test/xmltestdata/c14n-20/c14nQnameElem.xml Fixing Lib/test/test_tomllib/data/invalid/keys-and-vals/ends-early.toml Fixing Doc/library/socketserver.rst Fixing Lib/test/ziptestdata/README.md Fixing Objects/unicodetype_db.h Fixing Tools/msi/bundle/releaselocal.wixproj Fixing Lib/test/test_tomllib/data/invalid/invalid-comment-char.toml Fixing Modules/_sha3/sha3.c Fixing Lib/test/cjkencodings/gb18030-utf8.txt Fixing Lib/test/decimaltestdata/decSingle.decTest Fixing Tools/unicode/python-mappings/gb-18030-2000.xml Fixing Lib/test/test_email/data/msg_15.txt Fixing Tools/msi/path/path.wixproj Fixing Lib/test/decimaltestdata/divide.decTest Fixing Lib/test/decimaltestdata/dqNextToward.decTest Fixing .github/problem-matchers/msvc.json Fixing Tools/msi/msi.targets Fixing Tools/msi/launcher/launcher.wixproj Fixing Lib/test/randv2_64.pck Fixing Include/internal/pycore_blocks_output_buffer.h Fixing PCbuild/_elementtree.vcxproj.filters Fixing Doc/whatsnew/2.6.rst Fixing Lib/test/test_importlib/resources/data02/subdirectory/subsubdir/resource.txt Fixing Doc/library/rlcompleter.rst Fixing Tools/msi/bundle/packagegroups/launcher.wxs Fixing PCbuild/_testbuffer.vcxproj.filters Fixing Lib/test/decimaltestdata/remainder.decTest Fixing Lib/test/test_tomllib/data/valid/boolean.toml Fixing Lib/test/test_zoneinfo/data/zoneinfo_data.json Fixing Programs/_freeze_module.c Fixing Lib/test/decimaltestdata/ddRemainder.decTest Fixing Lib/test/cjkencodings/shift_jis-utf8.txt Fixing Doc/library/email.encoders.rst Fixing Tools/msi/core/core_d.wixproj Fixing Doc/library/audioop.rst Fixing Tools/msi/bundle/packagegroups/doc.wxs Fixing Tools/msi/path/path.wxs Fixing Doc/library/urllib.error.rst Fixing Doc/c-api/intro.rst Fixing Doc/library/marshal.rst Fixing Modules/_decimal/libmpdec/examples/powmod.c Fixing Lib/test/cjkencodings/gb2312.txt Fixing Doc/library/aifc.rst Fixing Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nQname.xml Fixing PCbuild/xxlimited.vcxproj.filters Fixing Lib/test/xmltestdata/c14n-20/out_inNsDefault_c14nDefault.xml Fixing PCbuild/_zoneinfo.vcxproj.filters Fixing Lib/test/decimaltestdata/max.decTest Fixing Lib/test/decimaltestdata/plus.decTest Fixing Lib/test/decimaltestdata/dqFMA.decTest Fixing Lib/test/test_tomllib/data/invalid/inline-table/file-end-after-key-val.toml Fixing PCbuild/_tkinter.vcxproj Fixing Objects/object_layout.md Fixing Lib/turtledemo/turtle.cfg Fixing Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nPrefixQnameXpathElem.xml Fixing Modules/_testcapi_feature_macros.inc Fixing Lib/test/cjkencodings/iso2022_jp-utf8.txt Fixing Doc/library/pipes.rst Fixing Lib/test/decimaltestdata/ln.decTest Fixing Tools/msi/bundle/packagegroups/test.wxs Fixing Python/intrinsics.c Fixing Tools/msi/bundle/Default.thm Fixing Mac/PythonLauncher/English.lproj/PreferenceWindow.nib/classes.nib Fixing Modules/_blake2/impl/blake2s-load-xop.h Fixing Include/warnings.h Fixing PC/crtlicense.txt Fixing pyconfig.h.in Fixing Doc/library/mailbox.rst Fixing PCbuild/unicodedata.vcxproj.filters Fixing Doc/library/_thread.rst Fixing PC/pyshellext.rc Fixing Doc/library/imaplib.rst Fixing Doc/howto/instrumentation.rst Fixing Lib/test/cjkencodings/cp949-utf8.txt Fixing Doc/library/email.header.rst Fixing Lib/test/decimaltestdata/dqRemainder.decTest Fixing Modules/_xxtestfuzz/dictionaries/fuzz_json_loads.dict Fixing Tools/msi/bundle/releaseweb.wixproj Fixing Tools/msi/bundle/Default.ARM64.xsl Fixing Lib/test/test_tomllib/data/invalid/inline-table/define-twice.toml Fixing Tools/freeze/win32.html Fixing Doc/library/winsound.rst Fixing Modules/getpath.c Fixing Lib/test/xmltestdata/c14n-20/out_inC14N1_c14nDefault.xml Fixing PC/frozen_dllmain.c Fixing Modules/_blake2/impl/blake2-impl.h Fixing Include/iterobject.h Fixing aclocal.m4 Fixing Modules/_ssl_data_300.h Fixing Modules/_blake2/impl/blake2b-load-sse41.h Fixing Modules/_xxtestfuzz/fuzz_json_loads_corpus/pass1.json Fixing PCbuild/_overlapped.vcxproj.filters Fixing Objects/unicodectype.c Fixing Lib/test/decimaltestdata/randoms.decTest Fixing Lib/test/decimaltestdata/dqEncode.decTest Fixing Lib/test/xmltestdata/c14n-20/out_inC14N3_c14nDefault.xml Fixing PCbuild/_wmi.vcxproj.filters Fixing Lib/idlelib/CREDITS.txt Fixing Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nDefault.xml Fixing Lib/test/xmltestdata/c14n-20/out_inC14N4_c14nTrim.xml Fixing Tools/msi/bundle/packagegroups/lib.wxs Fixing Modules/_decimal/libmpdec/examples/README.txt Fixing Tools/msi/core/core.wixproj Fixing Lib/test/xmltestdata/c14n-20/out_inNsDefault_c14nPrefix.xml Fixing Lib/test/test_email/data/msg_06.txt Fixing PCbuild/_multiprocessing.vcxproj.filters Fixing PCbuild/pylauncher.vcxproj.filters Fixing Lib/test/test_tomllib/data/invalid/literal-str/unclosed.toml Fixing Lib/test/decimaltestdata/maxmag.decTest Fixing Lib/test/xmltestdata/c14n-20/c14nQname.xml Fixing Lib/test/test_email/data/msg_44.txt Fixing Tools/cases_generator/interpreter_definition.md Fixing Lib/test/levenshtein_examples.json Fixing Lib/test/xmltestdata/c14n-20/out_inNsSuperfluous_c14nDefault.xml Fixing Include/internal/pycore_ast_state.h Fixing Modules/_decimal/libmpdec/literature/matrix-transform.txt Fixing Doc/whatsnew/2.4.rst Fixing Lib/test/test_tomllib/data/invalid/array/unclosed-empty.toml Fixing PCbuild/_testcapi.vcxproj Fixing Modules/_xxtestfuzz/fuzz_json_loads_corpus/pass2.json Fixing Lib/test/decimaltestdata/samequantum.decTest Fixing Modules/_decimal/libmpdec/examples/divmod.c Fixing Tools/msi/tcltk/tcltk.wixproj Fixing Lib/test/cjkencodings/big5.txt Fixing Lib/test/xmltestdata/c14n-20/doc.dtd Fixing PC/icons/logo.svg Fixing Modules/cjkcodecs/mappings_hk.h Fixing Lib/test/test_tomllib/data/invalid/array/unclosed-after-item.toml Fixing PC/icons/py.svg Fixing Doc/library/xml.sax.utils.rst Fixing Lib/test/cjkencodings/iso2022_jp.txt Fixing PCbuild/liblzma.vcxproj.filters Fixing Modules/_xxtestfuzz/fuzz_csv_reader_corpus/test.csv Fixing Doc/library/pyexpat.rst Fixing Modules/_hacl/Hacl_Streaming_SHA2.c Fixing Doc/library/sunau.rst Fixing Lib/test/test_tomllib/data/invalid/array/file-end-after-val.toml Fixing Lib/test/decimaltestdata/dqCanonical.decTest Fixing Lib/test/xmltestdata/c14n-20/c14nTrim.xml Fixing PCbuild/_uuid.vcxproj.filters Fixing Modules/_decimal/docstrings.h Fixing Modules/_ssl_data_111.h Fixing Objects/dictnotes.txt Fixing Misc/valgrind-python.supp Fixing Objects/capsule.c Fixing Doc/faq/installed.rst Fixing PCbuild/_overlapped.vcxproj Fixing Lib/test/xmltestdata/c14n-20/out_inNsContent_c14nQnameXpathElem.xml Fixing Lib/test/decimaltestdata/ddNextPlus.decTest Fixing Lib/test/xmltestdata/c14n-20/c14nPrefixQname.xml Fixing Modules/cjkcodecs/README Fixing Tools/msi/ucrt/ucrt.wixproj Fixing Lib/test/test_tomllib/data/valid/trailing-comma.toml Fixing Lib/test/decimaltestdata/ddSameQuantum.decTest Fixing Doc/library/pathlib-inheritance.svg Fixing PCbuild/_testimportmultiple.vcxproj.filters Fixing PCbuild/_testmultiphase.vcxproj Fixing PCbuild/prepare_ssl.bat Fixing Lib/test/test_tomllib/data/invalid/table/eof-after-opening.toml Fixing Tools/msi/bundle/packagegroups/core.wxs Fixing Lib/test/decimaltestdata/ddMaxMag.decTest Fixing Tools/msi/dev/dev_d.wixproj Fixing Lib/test/decimaltestdata/ddToIntegral.decTest Fixing Doc/howto/ipaddress.rst Fixing Doc/reference/introduction.rst Fixing PCbuild/pythonw.vcxproj.filters Fixing Doc/tutorial/appetite.rst Fixing PCbuild/select.vcxproj.filters Fixing Modules/_blake2/impl/blake2s-round.h Fixing Doc/library/modulefinder.rst Fixing Doc/library/text.rst Fixing Lib/test/decimaltestdata/dqDivide.decTest Fixing Doc/library/email.charset.rst Fixing PCbuild/_uuid.vcxproj Fixing Doc/library/grp.rst Fixing Modules/_decimal/libmpdec/literature/umodarith.lisp Fixing Doc/whatsnew/2.1.rst Fixing Mac/PythonLauncher/English.lproj/MyDocument.nib/classes.nib Fixing Tools/msi/bundle/packagegroups/crt.wxs Fixing Modules/_decimal/libmpdec/literature/mulmod-ppro.txt Fixing Tools/msi/exe/exe.wixproj Fixing Mac/Icons/ReadMe.txt Fixing PCbuild/_testmultiphase.vcxproj.filters Fixing Lib/test/decimaltestdata/dqAbs.decTest Fixing PCbuild/_decimal.vcxproj.filters Fixing Tools/msi/test/test.wixproj Fixing Lib/test/decimaltestdata/dqBase.decTest Fixing Lib/test/decimaltestdata/dqNextPlus.decTest Fixing Doc/c-api/marshal.rst Fixing PCbuild/_bz2.vcxproj Fixing PC/icons/pythonw.svg Fixing Lib/test/xmltestdata/c14n-20/out_inNsXml_c14nPrefix.xml Fixing Lib/test/test_tomllib/data/valid/empty-inline-table.json Fixing Modules/_sha3/LICENSE Fixing Lib/test/ieee754.txt Fixing Tools/msi/wix.props Fixing Doc/library/telnetlib.rst Fixing PCbuild/select.vcxproj Fixing Doc/whatsnew/2.0.rst Fixing Doc/library/binary.rst Fixing Python/getopt.c Fixing PCbuild/tix.vcxproj Fixing Lib/test/decimaltestdata/ddLogB.decTest Fixing Lib/test/cjkencodings/gb2312-utf8.txt Fixing PCbuild/_sqlite3.vcxproj Fixing Lib/test/decimaltestdata/ddFMA.decTest Fixing Modules/cjkcodecs/emu_jisx0213_2000.h Fixing Tools/msi/sign_build.ps1 Fixing Lib/test/decimaltestdata/ddClass.decTest Fixing Lib/test/test_tomllib/data/valid/dates-and-times/localtime.toml Fixing Lib/test/decimaltestdata/abs.decTest Fixing Lib/test/decimaltestdata/ddMax.decTest Fixing Lib/test/decimaltestdata/dqLogB.decTest Fixing Mac/BuildScript/README.rst Fixing Lib/test/test_tomllib/data/invalid/array-of-tables/overwrite-bool-with-aot.toml Fixing Doc/library/wave.rst Fixing Lib/test/xmltestdata/c14n-20/out_inC14N1_c14nComment.xml Fixing Doc/library/gzip.rst Fixing Doc/using/mac.rst Fixing Lib/test/decimaltestdata/log10.decTest Fixing Doc/library/nis.rst Fixing PCbuild/_testconsole.vcxproj.filters Fixing Tools/msi/exe/exe_pdb.wixproj Fixing Lib/test/test_tomllib/data/valid/no-newlines.toml Fixing Lib/test/xmltestdata/c14n-20/out_inNsRedecl_c14nDefault.xml Fixing Lib/test/test_email/data/msg_16.txt Fixing Lib/test/test_tomllib/data/invalid/boolean/invalid-false-casing.toml Fixing PC/classicAppCompat.can.xml Fixing Modules/_decimal/tests/runall-memorydebugger.sh Fixing PCbuild/venvwlauncher.vcxproj.filters Fixing Doc/library/trace.rst Fixing Doc/library/getopt.rst Fixing Doc/whatsnew/3.5.rst Fixing Doc/library/sndhdr.rst Fixing Modules/cjkcodecs/mappings_jp.h Fixing PC/icons/setup.svg Fixing Lib/test/empty.vbs Fixing .github/problem-matchers/gcc.json Fixing Doc/library/wsgiref.rst Fixing PCbuild/winsound.vcxproj.filters Fixing Lib/test/xmltestdata/c14n-20/out_inNsRedecl_c14nPrefix.xml Fixing Modules/_blake2/impl/blake2-config.h Fixing Lib/test/test_tomllib/data/invalid/inline-table/unclosed-empty.toml Fixing Lib/test/decimaltestdata/multiply.decTest Fixing PCbuild/python3dll.vcxproj Fixing Lib/test/cjkencodings/gbk-utf8.txt Fixing Lib/test/test_tomllib/data/invalid/non-scalar-escaped.toml Fixing Python/Python-ast.c Fixing Modules/_decimal/libmpdec/literature/six-step.txt Fixing Doc/howto/index.rst Fixing Lib/test/cjkencodings/johab.txt Fixing PCbuild/winsound.vcxproj Fixing Lib/idlelib/ChangeLog Fixing Lib/ctypes/macholib/README.ctypes Fixing PCbuild/pywlauncher.vcxproj Fixing Doc/c-api/gcsupport.rst Fixing PCbuild/_lzma.vcxproj.filters Fixing Lib/test/decimaltestdata/ddAbs.decTest Fixing Lib/test/test_tomllib/data/invalid/unclosed-string.toml Fixing Lib/test/test_email/data/msg_04.txt Fixing Doc/library/winreg.rst Fixing Doc/library/pwd.rst Fixing Lib/test/decimaltestdata/dqNextMinus.decTest Fixing Lib/test/decimaltestdata/ddCopySign.decTest Fixing Lib/test/test_email/data/msg_19.txt Fixing PCbuild/_testembed.vcxproj Fixing Lib/test/test_email/data/msg_43.txt Fixing Modules/_decimal/libmpdec/README.txt Fixing Tools/msi/bundle/bootstrap/pch.h Fixing Doc/library/spwd.rst Fixing Doc/library/site.rst Fixing Modules/_decimal/libmpdec/examples/multiply.c Fixing Lib/test/test_email/data/msg_05.txt Fixing PCbuild/_msi.vcxproj.filters Fixing Lib/test/mailcap.txt Fixing Doc/library/cgitb.rst Fixing Mac/BuildScript/resources/Welcome.rtf Fixing Mac/Resources/app/PkgInfo Fixing PCbuild/_socket.vcxproj Fixing Misc/NEWS.d/next/Core and Builtins/2022-10-06-23-32-11.gh-issue-98003.xWE0Yu.rst Fixing PCbuild/_ssl.vcxproj.filters Fixing Doc/library/dbm.rst Fixing Tools/msi/bundle/packagegroups/pip.wxs Fixing Tools/msi/bundle/snapshot.wixproj Fixing Modules/cjkcodecs/mappings_kr.h Fixing Tools/msi/test/test_d.wixproj Fixing Doc/library/curses.ascii.rst Fixing Lib/test/decimaltestdata/exp.decTest Fixing Doc/library/xml.sax.rst Fixing PCbuild/python_uwp.vcxproj.filters Fixing Lib/test/decimaltestdata/nexttoward.decTest Fixing PCbuild/_wmi.vcxproj Fixing PCbuild/_hashlib.vcxproj.filters trim trailing whitespace.................................................Passed

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

AlexWaygood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

Best to leave end-of-file-fixer for a followup PR, if it affects so many files.

This looks great!

AlexWaygood commented May 8, 2023
edited
Loading

Copy link
Copy Markdown
Member

The PR looks ok, but doesn't patchcheck already check for trailing whitespace?

Are these old files that haven't been touched since patchcheck was added so they never got fixed (iirc patchcheck only checks modified files)?

patchcheck.py currently only runs on Azure Pipelines, and only runs on PRs. It doesn't run on existing files in the repo, which often causes confusion when new contributors edit a file that hasn't been touched in many years, and find that patchcheck.py starts complaining at them.

Azure Pipelines also isn't a required check, and it often fails due to flaky Windows tests that sometimes cause PermissionErrors, so failures there are often ignored by reviewers. Moving this into a separate check means it'll be easier to see exactly what has failed.

pre-commit-hooks is also a better-tested project than patchcheck.py, and pre-commit is more extensible. We can easily add more hooks (such as end-of-file-fixer) in the future if we want to.

(We could even consider enabling pre-commit.ci, which would mean fixes would be automatically pushed to PR branches.)

hugovk commented May 8, 2023

Copy link
Copy Markdown
Member Author

The PR looks ok, but doesn't patchcheck already check for trailing whitespace?

It does. This checks it on GitHub Actions which makes it easier to set as a required check, which should avoid accidental whitespace additions like in #103974

Are these old files that haven't been touched since patchcheck was added so they never got fixed (iirc patchcheck only checks modified files)?

I check one, and yes, Tools/msi/bundle/bootstrap/resource.h was added 9 years ago.

Comment thread .github/workflows/lint.yml Show resolved Hide resolved
Comment thread .github/workflows/lint.yml Show resolved Hide resolved
Comment thread .pre-commit-config.yaml Show resolved Hide resolved

AlexWaygood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

Seems unlikely that this patch is the cause of the segfault on MacOS

hugovk commented May 8, 2023

Copy link
Copy Markdown
Member Author

Yup, I re-ran macOS and it now passes ✅

hugovk merged commit d513dde into python:main May 8, 2023
hugovk deleted the pre-commit branch May 8, 2023 14:03
jbower-fb pushed a commit to jbower-fb/cpython that referenced this pull request May 8, 2023
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
carljm added a commit to carljm/cpython that referenced this pull request May 9, 2023
* main: (47 commits) pythongh-97696 Remove unnecessary check for eager_start kwarg (python#104188) pythonGH-104308: socket.getnameinfo should release the GIL (python#104307) pythongh-104310: Add importlib.util.allowing_all_extensions() (pythongh-104311) pythongh-99113: A Per-Interpreter GIL! (pythongh-104210) pythonGH-104284: Fix documentation gettext build (python#104296) pythongh-89550: Buffer GzipFile.write to reduce execution time by ~15% (python#101251) pythongh-104223: Fix issues with inheriting from buffer classes (python#104227) pythongh-99108: fix typo in Modules/Setup (python#104293) pythonGH-104145: Use fully-qualified cross reference types for the bisect module (python#104172) pythongh-103193: Improve `getattr_static` test coverage (python#104286) Trim trailing whitespace and test on CI (python#104275) pythongh-102500: Remove mention of bytes shorthand (python#104281) pythongh-97696: Improve and fix documentation for asyncio eager tasks (python#104256) pythongh-99108: Replace SHA3 implementation HACL* version (python#103597) pythongh-104273: Remove redundant len() calls in argparse function (python#104274) pythongh-64660: Don't hardcode Argument Clinic return converter result variable name (python#104200) pythongh-104265 Disallow instantiation of `_csv.Reader` and `_csv.Writer` (python#104266) pythonGH-102613: Improve performance of `pathlib.Path.rglob()` (pythonGH-104244) pythongh-103650: Fix perf maps address format (python#103651) pythonGH-89812: Churn `pathlib.Path` methods (pythonGH-104243) ...
carljm added a commit to carljm/cpython that referenced this pull request May 9, 2023
* main: (29 commits) pythongh-104276: Make `_struct.unpack_iterator` type use type flag instead of custom constructor (python#104277) pythongh-97696: Move around and update the whatsnew entry for asyncio eager task factory (python#104298) pythongh-103193: Fix refleaks in `test_inspect` and `test_typing` (python#104320) require-pr-label.yml: Add missing "permissions:" (python#104309) pythongh-90656: Add platform triplets for 64-bit LoongArch (LA64) (python#30939) pythongh-104180: Read SOCKS proxies from macOS System Configuration (python#104181) pythongh-97696 Remove unnecessary check for eager_start kwarg (python#104188) pythonGH-104308: socket.getnameinfo should release the GIL (python#104307) pythongh-104310: Add importlib.util.allowing_all_extensions() (pythongh-104311) pythongh-99113: A Per-Interpreter GIL! (pythongh-104210) pythonGH-104284: Fix documentation gettext build (python#104296) pythongh-89550: Buffer GzipFile.write to reduce execution time by ~15% (python#101251) pythongh-104223: Fix issues with inheriting from buffer classes (python#104227) pythongh-99108: fix typo in Modules/Setup (python#104293) pythonGH-104145: Use fully-qualified cross reference types for the bisect module (python#104172) pythongh-103193: Improve `getattr_static` test coverage (python#104286) Trim trailing whitespace and test on CI (python#104275) pythongh-102500: Remove mention of bytes shorthand (python#104281) pythongh-97696: Improve and fix documentation for asyncio eager tasks (python#104256) pythongh-99108: Replace SHA3 implementation HACL* version (python#103597) ...

Copy link
Copy Markdown

GH-108215 is a backport of this pull request to the 3.11 branch.

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Check for whitespace in CI

6 participants

Footer

© 2026 GitHub, Inc.