ci: fix style

long2ice · Jan 5, 2024 · 0a749a8 · 0a749a8
1 parent e69d56b
commit 0a749a8
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 61 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: "3.x"
+          python-version: "3.7"
       - name: Install and configure Poetry
         run: |
           pip install -U pip poetry

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.7'
       - name: Install and configure Poetry
         run: |
           pip install -U pip poetry

diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ style: deps
 
 check: deps
 	black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
-	flake8 $(checkfiles)
+	ruff $(checkfiles)
 	bandit -x tests -r $(checkfiles)
 
 test: deps

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,7 +23,7 @@ python = "^3.7"
 uvicorn = "*"
 bandit = "*"
 black = "*"
-flake8 = "*"
+ruff = "*"
 isort = "*"
 pytest = "*"
 pytest-asyncio = "*"
@@ -34,3 +34,13 @@ requests = "*"
 [build-system]
 build-backend = "poetry.core.masonry.api"
 requires = ["poetry-core>=1.0.0"]
+
+[tool.isort]
+profile = "black"
+
+[tool.black]
+line-length = 100
+target-version = ['py38', 'py39', 'py310', 'py311']
+
+[tool.ruff]
+line-length = 100