Skip to content

Commit

Permalink
Merge pull request #137 from shunichironomura/update-linting
Browse files Browse the repository at this point in the history
Remove black formatter
  • Loading branch information
shunichironomura authored Dec 25, 2023
2 parents 9a1159d + 79dc24f commit d9512b6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 26 deletions.
16 changes: 12 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
{
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
"python.terminal.activateEnvironment": true,
"python.formatting.provider": "black",
"python.analysis.diagnosticMode": "workspace",
"python.analysis.typeCheckingMode": "basic",
"python.formatting.blackPath": "${workspaceFolder}/.venv/bin/black",
"[python]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
},
"editor.tabSize": 4,
"editor.insertSpaces": true
},
"python.languageServer": "Pylance",
"python.linting.enabled": false,
"cSpell.words": [
"autouse",
"capsula",
Expand All @@ -29,5 +27,15 @@
"savefig",
"xlim"
],
"python.linting.mypyEnabled": true
"yaml.schemas": {
"https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml"
},
"yaml.customTags": [
"!ENV scalar",
"!ENV sequence",
"!relative scalar",
"tag:yaml.org,2002:python/name:material.extensions.emoji.to_svg",
"tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji",
"tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format"
]
}
22 changes: 0 additions & 22 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ typing-extensions = { version = ">=4.7.1", python = "<3.11" }

[tool.poetry.group.dev.dependencies]
ruff = ">=0.0.275"
black = ">=23.3.0"
mypy = ">=1.4.0"
pre-commit = ">=3.3.3"
pytest = ">=7.4.0"
Expand Down Expand Up @@ -58,28 +57,8 @@ ignore_missing_imports = true
module = "matplotlib.*"
ignore_missing_imports = true

[tool.black]
line-length = 120
include = '\.pyi?$'
target-version = ['py38', 'py39', 'py310', 'py311']

exclude = '''
/(
\.git
| \.hg
| \.mypy_cache
| \.tox
| \.venv
| _build
| buck-out
| build
| dist
)/
'''

[tool.ruff]
target-version = "py38"
# Same as Black.
line-length = 120
select = ["ALL"]
ignore = [
Expand Down Expand Up @@ -125,4 +104,3 @@ keep-runtime-typing = true
# "ANN201",
]
"examples/*" = ["INP001"]
"__init__.py" = ["F401"]

0 comments on commit d9512b6

Please sign in to comment.