Skip to content

Commit

Permalink
Merge pull request #474 from afuetterer/ruff-format
Browse files Browse the repository at this point in the history
chore: switch from black to ruff formatter
  • Loading branch information
huberrob committed Jan 12, 2024
2 parents e8953e0 + 38153f8 commit b6b4cd2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
7 changes: 2 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ repos:
args: [--autofix, --indent, '2']
- id: pretty-format-yaml
args: [--autofix, --indent, '2']
- repo: https://github.com/psf/black
rev: 23.12.1
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.11
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
args: [--fix, --show-fixes, --exit-non-zero-on-fix]
- id: ruff-format
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#'sphinx.ext.imgmath',
#'sphinx.ext.ifconfig',
"sphinx.ext.viewcode",
"myst_parser"
"myst_parser",
#'sphinx.ext.intersphinx'
]

Expand Down
4 changes: 1 addition & 3 deletions fuji_server/helper/request_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,7 @@ def content_negotiate(self, metric_id="", ignore_html=True):
# init to avoid empty responses
self.parse_response = self.response_content
while True:
for (
at
) in (
for at in (
AcceptTypes
): # e.g., at.name = html, at.value = 'text/html, application/xhtml+xml'
if at.name == "xml" and str(self.content_type).endswith("+xml"):
Expand Down
4 changes: 0 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ Homepage = "https://www.f-uji.net"
Issues = "https://github.com/pangaea-data-publisher/fuji/issues"
Source = "https://github.com/pangaea-data-publisher/fuji"

[tool.black]
line-length = 120
target_version = ["py311"]

[tool.coverage.report]
show_missing = true
skip_covered = true
Expand Down

0 comments on commit b6b4cd2

Please sign in to comment.