summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Raimist <aaron@raim.ist>2018-12-03 22:38:41 -0600
committerAaron Raimist <aaron@raim.ist>2018-12-03 22:38:47 -0600
commit3518c28aa87b6394762d2d0e80b8fec5ef5772e2 (patch)
tree0cb4adda502ffbb0d1407e5f8d2b5819285f42bc
parentWorkaround for non-ascii event ids (#4241) (diff)
downloadsynapse-3518c28aa87b6394762d2d0e80b8fec5ef5772e2.tar.xz
Add a basic .editorconfig
Signed-off-by: Aaron Raimist <aaron@raim.ist>
-rw-r--r--.editorconfig9
-rw-r--r--MANIFEST.in1
-rw-r--r--changelog.d/4257.misc1
3 files changed, 11 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..3edf9e717c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+# EditorConfig https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
diff --git a/MANIFEST.in b/MANIFEST.in
index d0e49713da..ec18819bc9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -26,6 +26,7 @@ recursive-include synapse/static *.js
 exclude Dockerfile
 exclude .dockerignore
 exclude test_postgresql.sh
+exclude .editorconfig
 
 include pyproject.toml
 recursive-include changelog.d *
diff --git a/changelog.d/4257.misc b/changelog.d/4257.misc
new file mode 100644
index 0000000000..43ac24cb7d
--- /dev/null
+++ b/changelog.d/4257.misc
@@ -0,0 +1 @@
+Add a basic .editorconfig