diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e520e8f1..048c67c3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 diff --git a/docs/source/conf.py b/docs/source/conf.py index b4c4471f..95e0e43e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -39,7 +39,7 @@ #'sphinx.ext.imgmath', #'sphinx.ext.ifconfig', "sphinx.ext.viewcode", - "myst_parser" + "myst_parser", #'sphinx.ext.intersphinx' ] diff --git a/fuji_server/helper/request_helper.py b/fuji_server/helper/request_helper.py index 3d7ecd9d..6ad5a852 100644 --- a/fuji_server/helper/request_helper.py +++ b/fuji_server/helper/request_helper.py @@ -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"): diff --git a/pyproject.toml b/pyproject.toml index 12094861..2666a2d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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