diff --git a/pyproject.toml b/pyproject.toml index 1d2343c6..c60bc2c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,11 +23,14 @@ markers = [ select = [ "C4", # flake8-comprehensions "COM", # flake8-commas + "E", # pycodestyle error + "F", # pyflakes "I", # isort "ISC", # flake8-implicit-str-concat "PIE", # flake8-pie "RUF", # Ruff-specific rules "UP", # pyupgrade + "W", # pycodestyle warning ] line-length = 110 target-version = "py38" diff --git a/tests/integration/test_aiohttp.py b/tests/integration/test_aiohttp.py index a8d14c17..c4e3dd9e 100644 --- a/tests/integration/test_aiohttp.py +++ b/tests/integration/test_aiohttp.py @@ -4,12 +4,13 @@ import pytest +import vcr + asyncio = pytest.importorskip("asyncio") aiohttp = pytest.importorskip("aiohttp") -import vcr -from .aiohttp_utils import aiohttp_app, aiohttp_request +from .aiohttp_utils import aiohttp_app, aiohttp_request # noqa: E402 def run_in_loop(fn): diff --git a/tests/integration/test_boto.py b/tests/integration/test_boto.py index 4040b353..fcf5a440 100644 --- a/tests/integration/test_boto.py +++ b/tests/integration/test_boto.py @@ -1,16 +1,16 @@ -import pytest - -boto = pytest.importorskip("boto") - from configparser import DuplicateSectionError -import boto -import boto.iam -from boto.s3.connection import S3Connection -from boto.s3.key import Key +import pytest import vcr +boto = pytest.importorskip("boto") + +import boto # noqa +import boto.iam # noqa +from boto.s3.connection import S3Connection # noqa +from boto.s3.key import Key # noqa + def test_boto_stubs(tmpdir): with vcr.use_cassette(str(tmpdir.join("boto-stubs.yml"))): diff --git a/tests/integration/test_boto3.py b/tests/integration/test_boto3.py index 02a0a03f..d1a4866f 100644 --- a/tests/integration/test_boto3.py +++ b/tests/integration/test_boto3.py @@ -2,15 +2,15 @@ import pytest -boto3 = pytest.importorskip("boto3") +import vcr -import boto3 -import botocore +boto3 = pytest.importorskip("boto3") -import vcr +import boto3 # noqa +import botocore # noqa try: - from botocore import awsrequest + from botocore import awsrequest # noqa botocore_awsrequest = True except ImportError: diff --git a/tests/integration/test_httpx.py b/tests/integration/test_httpx.py index d8539e13..afc6fbd8 100644 --- a/tests/integration/test_httpx.py +++ b/tests/integration/test_httpx.py @@ -2,11 +2,13 @@ import pytest +import vcr + asyncio = pytest.importorskip("asyncio") httpx = pytest.importorskip("httpx") -import vcr -from vcr.stubs.httpx_stubs import HTTPX_REDIRECT_PARAM + +from vcr.stubs.httpx_stubs import HTTPX_REDIRECT_PARAM # noqa: E402 class BaseDoRequest: diff --git a/tests/integration/test_requests.py b/tests/integration/test_requests.py index d4622f43..493df41e 100644 --- a/tests/integration/test_requests.py +++ b/tests/integration/test_requests.py @@ -5,7 +5,6 @@ import vcr requests = pytest.importorskip("requests") -from requests.exceptions import ConnectionError # E402 def test_status_code(httpbin_both, tmpdir): diff --git a/tests/integration/test_wild.py b/tests/integration/test_wild.py index 0ae4db05..6e0df087 100644 --- a/tests/integration/test_wild.py +++ b/tests/integration/test_wild.py @@ -5,10 +5,10 @@ import pytest -requests = pytest.importorskip("requests") - import vcr +requests = pytest.importorskip("requests") + def test_domain_redirect(): """Ensure that redirects across domains are considered unique""" diff --git a/tests/unit/test_vcr_import.py b/tests/unit/test_vcr_import.py index ba8b53f8..3194b80a 100644 --- a/tests/unit/test_vcr_import.py +++ b/tests/unit/test_vcr_import.py @@ -6,10 +6,6 @@ def test_vcr_import_deprecation(recwarn): # Remove imported module entry if already loaded in another test del sys.modules["vcr"] - import vcr + import vcr # noqa: F401 - if sys.version_info[0] == 2: - assert len(recwarn) == 1 - assert issubclass(recwarn[0].category, DeprecationWarning) - else: assert len(recwarn) == 0 diff --git a/tox.ini b/tox.ini index 2fb5305f..d46e725f 100644 --- a/tox.ini +++ b/tox.ini @@ -37,6 +37,7 @@ skipsdist = True commands = black --version black --check --diff . + ruff --version ruff check . deps = black diff --git a/vcr/__init__.py b/vcr/__init__.py index 8da5cb20..13495aac 100644 --- a/vcr/__init__.py +++ b/vcr/__init__.py @@ -2,7 +2,7 @@ from logging import NullHandler from .config import VCR -from .record_mode import RecordMode as mode # import is not used in this file +from .record_mode import RecordMode as mode # noqa __version__ = "5.0.0" diff --git a/vcr/patch.py b/vcr/patch.py index 83f6361d..abe089f7 100644 --- a/vcr/patch.py +++ b/vcr/patch.py @@ -18,7 +18,7 @@ from botocore.awsrequest import AWSHTTPConnection, AWSHTTPSConnection except ImportError as e: try: - import botocore.vendored.requests + import botocore.vendored.requests # noqa: F401 except ImportError: # pragma: no cover pass else: