summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKOLANICH <kolan_n@mail.ru>2021-02-06 23:03:13 +0300
committerJason R. Coombs <jaraco@jaraco.com>2021-02-21 14:44:57 -0500
commit38fff62edb5e282f144dc77cc1bf5555367336d9 (patch)
treef4fa59bb4e16daafe20195c45a0c69e0aa271cc2
parent743af7249d56e55a7c2c5f3111958ceee008d8ea (diff)
downloadpytest-runner-38fff62edb5e282f144dc77cc1bf5555367336d9.tar.gz
Added an .editorconfig. Pull request jaraco/skeleton#43.
-rw-r--r--.editorconfig15
-rw-r--r--pytest.ini4
2 files changed, 17 insertions, 2 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..6385b57
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+insert_final_newline = true
+end_of_line = lf
+
+[*.py]
+indent_style = space
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
diff --git a/pytest.ini b/pytest.ini
index d7f0b11..016063b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -5,5 +5,5 @@ doctest_optionflags=ALLOW_UNICODE ELLIPSIS
# workaround for warning pytest-dev/pytest#6178
junit_family=xunit2
filterwarnings=
- # https://github.com/pytest-dev/pytest/issues/6928
- ignore:direct construction of .*Item has been deprecated:DeprecationWarning
+ # https://github.com/pytest-dev/pytest/issues/6928
+ ignore:direct construction of .*Item has been deprecated:DeprecationWarning