diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 2d75cb62..5f596955 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -12,7 +12,7 @@ jobs: - uses: 'actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c' # v5.0.0 with: python-version: ${{ matrix.python-version }} - - name: Install tox - run: pip install tox + - name: Install pre-commit + run: pip install pre-commit - name: Run linting - run: tox -e flake8,isort + run: pre-commit run -a diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ff13fe64..3a2f59ef 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,12 +25,6 @@ repos: hooks: - id: isort - # Allow tox to run isort as a linter. - - id: isort - alias: isort-check - args: [--check] - stages: [manual] - - repo: https://github.com/asottile/pyupgrade rev: v3.15.0 hooks: diff --git a/setup.py b/setup.py index 4ca0a540..064e01c8 100644 --- a/setup.py +++ b/setup.py @@ -35,8 +35,6 @@ def get_version(): 'python-dateutil>=2.6', 'backports.zoneinfo;python_version<"3.9"', 'pymysql', - 'flake8>=2.4.0', - 'isort>=4.2.2', 'pyodbc', ], 'babel': ['Babel>=1.3'], diff --git a/tox.ini b/tox.ini index 62b80468..4586b0d3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,6 @@ [tox] envlist = py{37, 38, 39, 310, 311}-sqlalchemy{13, 14, 2} - flake8 - isort [testenv] commands = @@ -31,18 +29,6 @@ passenv = SQLALCHEMY_UTILS_TEST_* recreate = True -[testenv:flake8] -skip_install = True -recreate = False -deps = pre-commit -commands = pre-commit run --hook-stage manual --all flake8 - -[testenv:isort] -skip_install = True -recreate = False -deps = pre-commit -commands = pre-commit run --hook-stage manual --all isort-check - [pytest] filterwarnings = error