From 0eab70f355a0634224d0deafb2025d32695b11a7 Mon Sep 17 00:00:00 2001 From: Ali-Akber Saifee Date: Thu, 9 Mar 2023 14:32:16 -0800 Subject: [PATCH] Revert "Switch to ruff for linting" This reverts commit b9222426f3b70441d2eeb30e8c42e4959957428b. --- .github/workflows/main.yml | 5 +++-- Makefile | 4 ++-- flask_limiter/extension.py | 14 +++++++++++--- pyproject.toml | 3 --- requirements/dev.txt | 3 ++- 5 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 pyproject.toml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fbeae2b8..50867508 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,9 +25,10 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel pip install -r requirements/ci.txt - - name: Lint with ruff + - name: Lint with flake8 run: | - ruff flask_limiter tests + flake8 . --count --show-source --statistics + flake8 . --count --exit-zero --max-complexity=10 - name: Lint with black run: | black tests flask_limiter diff --git a/Makefile b/Makefile index ab06285c..cc6ef1af 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ lint: black --check tests flask_limiter mypy flask_limiter - ruff flask_limiter tests + flake8 flask_limiter tests lint-fix: black tests flask_limiter mypy flask_limiter isort -r --profile=black tests flask_limiter - ruff --fix flask_limiter tests + autoflake8 -i -r tests flask_limiter diff --git a/flask_limiter/extension.py b/flask_limiter/extension.py index 0af3d3d1..600337d8 100644 --- a/flask_limiter/extension.py +++ b/flask_limiter/extension.py @@ -1,9 +1,17 @@ -""" -Flask-Limiter Extension -""" from __future__ import annotations import dataclasses +import traceback +import warnings +from types import TracebackType + +from ordered_set import OrderedSet + +from .util import get_qualified_name + +""" +Flask-Limiter Extension +""" import datetime import itertools import logging diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index ac9b6b80..00000000 --- a/pyproject.toml +++ /dev/null @@ -1,3 +0,0 @@ -[tool.ruff] -line-length=100 - diff --git a/requirements/dev.txt b/requirements/dev.txt index 202cb4cb..fe251f88 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,7 +1,8 @@ -r test.txt -r docs.txt -ruff +autoflake8 black +flake8 isort keyring mypy