Skip to content

Commit

Permalink
Merge 02bece5 into 5ed53f1
Browse files Browse the repository at this point in the history
  • Loading branch information
ob-stripe committed Aug 6, 2019
2 parents 5ed53f1 + 02bece5 commit 76287ce
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 31 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
; https://editorconfig.org/

root = true

[*]
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
end_of_line = lf
charset = utf-8

[*.{cfg,ini,json,toml,yml}]
indent_size = 2

[Makefile]
indent_style = tab
9 changes: 5 additions & 4 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"recommendations": [
"ms-python.python",
"bungcip.better-toml"
]
"recommendations": [
"ms-python.python",
"bungcip.better-toml",
"EditorConfig.editorconfig"
]
}
46 changes: 19 additions & 27 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,24 @@
{
"editor.renderWhitespace": "all",
"files.exclude": {
"**/*.pyc": {"when": "$(basename).py"},
"**/__pycache__": true
},
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"[python]": {
"editor.detectIndentation": false,
"editor.insertSpaces": true,
"editor.rulers": [
80
],
"editor.tabSize": 4,
},
// Show the path in the top window bar.
"window.title": "${rootName}${separator}${activeEditorMedium}",

// Formatting
"editor.formatOnSave": true,
"python.formatting.provider": "black",
"editor.renderWhitespace": "all",
"files.exclude": {
"**/*.pyc": { "when": "$(basename).py" },
"**/__pycache__": true
},

// Linting
"python.linting.enabled": true,
"python.linting.pylintEnabled": false,
"python.linting.flake8Enabled": true,
// Formatting
"editor.formatOnSave": true,
"python.formatting.provider": "black",

// Tests
"python.testing.unittestEnabled": false,
"python.testing.pyTestEnabled": true,
"python.testing.nosetestsEnabled": false
// Linting
"python.linting.enabled": true,
"python.linting.pylintEnabled": false,
"python.linting.flake8Enabled": true,

// Tests
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"python.testing.nosetestsEnabled": false
}

0 comments on commit 76287ce

Please sign in to comment.