Merge from 5.x: PR #18691

Fixes #18690

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Removed CRLF from the entire codebase
+bdfe0b59821951584de3f72768693a151ca8350a

.gitattributes

@@ -1,5 +1,307 @@
+# Standard gitattributes config
+
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text eol=lf
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+
+*.txt       text
+
+# Source code
+*.bash      text eol=lf
+*.c         text
+*.cpp       text
+*.csh       text eol=lf
+*.fish      text eol=lf
+*.inc       text
+*.ipynb     text
+*.h         text
+*.ksh       text eol=lf
+*.ps1       text
+*.pxd       text diff=python
+*.py        text diff=python
+*.py3       text diff=python
+*.pyi       text diff=python
+*.pyw       text diff=python
+*.pyx       text diff=python
+*.qss       text
+*.r         text
+*.R         text
+*.rb        text
+*.rmd       text
+*.Rmd       text
+*.rnw       text
+*.Rnw       text
+*.sh        text eol=lf
+*.zsh       text eol=lf
+
+# Documentation
+*.adoc      text
+*.latex     text
+*.LaTeX     text
+*.markdown  text
+*.md        text
+*.po        text
+*.pot       text
+*.rd        text
+*.Rd        text
+*.rst       text
+*.tex       text
+*.TeX       text
+*.tmpl      text
+*.tpl       text
+
+# Web
+*.atom      text
+*.css       text
+*.htm       text
+*.html      text
+*.js        text
+*.jsx       text
+*.json      text
+*.php       text
+*.pl        text
+*.rss       text
+*.sass      text
+*.scss      text
+*.xht       text
+*.xhtml     text
+
+# Configuration
+*.cfg       text
+*.cnf       text
+*.conf      text
+*.config    text
+*.desktop   text
+*.inf       text
+*.ini       text
+*.plist     text
+*.toml      text
+*.xml       text
+*.yml       text
+*.yaml      text
+
+# Plain text data
+*.cdl       text
+*.csv       text
+*.dif       text
+*.geojson   text
+*.gml       text
+*.kml       text
+*.sql       text
+*.tab       text
+*.tsv       text
+*.wkt       text
+
+# Other text files
+*.diff      -text
+*.patch     -text
+
+# Special files
+.*rc            text
+.checkignore    text
+.ciocheck       text
+.ciocopyright   text
+.editorconfig   text
+.gitattributes  export-ignore
+.gitconfig      export-ignore
+.gitignore      export-ignore
+.gitmodules     export-ignore
+.gitkeep        export-ignore
+*.lektorproject text
+.nojekyll       text
+.project        text
+
+AUTHORS         text
+CHANGELOG       text
+CHANGES         text
+CONTRIBUTING    text
+INSTALL         text
+license         text
+LICENSE         text
+NEWS            text
+NOTICES         text
+readme          text
+*README*        text
+RELEASE         text
+TODO            text
+
+browserslist    text
+contents.lr     text
+makefile        text
+Makefile        text
+MANIFEST.in     text
+
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat           text eol=crlf
+*.cmd           text eol=crlf
+*.vbs           text eol=crlf
+*.vb            text eol=crlf
+
+
+# Denote all files that are truly binary and should not be modified.
+
+# Executable
+*.app       binary
+*.bin       binary
+*.deb       binary
+*.dll       binary
+*.dylib     binary
+*.elf       binary
+*.exe       binary
+*.ko        binary
+*.lib       binary
+*.msi       binary
+*.o         binary
+*.obj       binary
+*.pyc       binary
+*.pyd       binary
+*.pyo       binary
+*.rdb       binary
+*.Rdb       binary
+*.rdx       binary
+*.Rdx       binary
+*.rpm       binary
+*.so        binary
+*.sys       binary
+
+# Data
+*.cdf       binary
+*.db        binary
+*.dta       binary
+*.feather   binary
+*.fit       binary
+*.fits      binary
+*.fts       binary
+*.fods      binary
+*.geotiff   binary
+*.gpkg      binary
+*.h4        binary
+*.h5        binary
+*.hdf       binary
+*.hdf4      binary
+*.hdf5      binary
+*.mat       binary
+*.nc        binary
+*.npy       binary
+*.npz       binary
+*.odb       binary
+*.ods       binary
+*.p         binary
+*.parquet   binary
+*.pickle    binary
+*.pkl       binary
+*.rdata     binary
+*.Rdata     binary
+*.RData     binary
+*.rda       binary
+*.Rda       binary
+*.rds       binary
+*.Rds       binary
+*.sav       binary
+*.sqlite    binary
+*.wkb       binary
+*.xls       binary
+*.XLS       binary
+*.xlsx      binary
+*.XLSX      binary
+
+# Documents
+*.doc       binary
+*.DOC       binary
+*.docx      binary
+*.DOCX      binary
+*.epub      binary
+*.fodp      binary
+*.fodt      binary
+*.odp       binary
+*.odt       binary
+*.pdf       binary
+*.PDF       binary
+*.ppt       binary
+*.PPT       binary
+*.pptx      binary
+*.PPTX      binary
+*.rtf       binary
+*.RTF       binary
+
+# Graphics
+*.ai        binary
+*.bmp       binary
+*.eps       binary
+*.fodg      binary
+*.gif       binary
+*.icns      binary
+*.ico       binary
+*.jp2       binary
+*.jpeg      binary
+*.jpg       binary
+*.mo        binary
+*.pdn       binary
+*.png       binary
+*.PNG       binary
+*.psd       binary
+*.odg       binary
+*.svg       binary
+*.svgz      binary
+*.tif       binary
+*.tiff      binary
+*.webp      binary
+*.xcf       binary
+
+# Fonts
+*.eot       binary
+*.otc       binary
+*.otf       binary
+*.ttc       binary
+*.ttf       binary
+*.woff      binary
+*.woff2     binary
+
+# Audio/Video
+*.aac       binary
+*.flac      binary
+*.mka       binary
+*.mkv       binary
+*.mp3       binary
+*.mp4       binary
+*.oga       binary
+*.ogg       binary
+*.ogv       binary
+*.opus      binary
+*.wav       binary
+*.webm      binary
+
+
+# Archives
+*.7z        binary
+*.bz2       binary
+*.dmg       binary
+*.gz        binary
+*.lz        binary
+*.lzma      binary
+*.pyz       binary
+*.rar       binary
+*.sz        binary
+*.tar       binary
+*.tbz2      binary
+*.tgz       binary
+*.tlz       binary
+*.txz       binary
+*.xz        binary
+*.zip       binary
+
+# Spyder-related
+*.results   binary
+*.spydata   binary
+
+# Other
+*.bak       binary
+*.lnk       binary
+*.temp      binary
+*.tmp       binary
+
 # Github helper pieces to make some files not show up in diffs automatically
 external-deps/**/* linguist-generated=true
-
-# Get better diffs for Python files
-*.py diff=python

setup.cfg

@@ -3,6 +3,7 @@ ignore =
     .codecov.yml
     .codecov.yml
     .coveragerc
+    .git-blame-ignore-revs
     .pep8speaks.yml
     Announcements.md
     CHANGELOG.md