From 760baa87801203063ee8244215ce42853602e9d9 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Thu, 30 May 2024 11:37:47 -0500 Subject: [PATCH] Update `.gitattributes` to match `.editorconfig` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Expand `.editorconfig` with a few missing extensions & match line-length specified in `.flake8` --- .editorconfig | 8 ++++---- .gitattributes | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1889885a7d..f6fbafbbe5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,17 +10,17 @@ trim_trailing_whitespace = true end_of_line = lf charset = utf-8 -[*.py] -max_line_length = 78 +[{*.py,SConstruct,SConscript}] +max_line_length = 88 ensure_newline_before_comments = true include_trailing_comma = true use_parentheses = true -[*.xml] +[*.{xml,yml,yaml}] indent_size = 2 [*.rst] indent_size = 3 -[*.bat] +[*.{bat,cmd,ps1}] end_of_line = crlf diff --git a/.gitattributes b/.gitattributes index 8b807dfb94..dcf034f78c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,10 @@ +* text=auto eol=lf +*.bat eol=crlf +*.cmd eol=crlf +*.ps1 eol=crlf + doc/* linguist-documentation SCons/Tool/docbook/docbook-xsl-1.76.1 linguist-vendored *.xml linguist-documentation *.xsl linguist-documentation *.gen linguist-documentation - -*.in eol=lf