diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-12-04 11:10:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 11:10:02 +0100 |
| commit | a484735bb0d4ef8f16d7c225c09b15555bc0b2cc (patch) | |
| tree | e7c570971a55be3a11914f0c07a30670db8e6450 | |
| parent | Run the AS senders as background processes (#4189) (diff) | |
| parent | Add a basic .editorconfig (diff) | |
| download | synapse-a484735bb0d4ef8f16d7c225c09b15555bc0b2cc.tar.xz | |
Merge pull request #4257 from aaronraimist/add-editorconfig
Add a basic .editorconfig
| -rw-r--r-- | .editorconfig | 9 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | changelog.d/4257.misc | 1 |
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 |