diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d5c2319..96cd29d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,13 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.10 + rev: v0.15.6 hooks: - id: ruff args: [--fix] - id: ruff-format - repo: https://github.com/compilerla/conventional-pre-commit - rev: v4.1.0 + rev: v4.4.0 hooks: - id: conventional-pre-commit stages: [commit-msg] \ No newline at end of file diff --git a/Makefile b/Makefile index 1db9a4f..57460b8 100644 --- a/Makefile +++ b/Makefile @@ -17,12 +17,12 @@ test-docker: docker compose -f docker-compose.yml -f docker-compose.test.yml down lint: - uv run ruff check src/ tests/ - uv run ruff format --check src/ tests/ + uv run ruff check src/ + uv run ruff format --check src/ lint-fix: - uv run ruff check --fix src/ tests/ - uv run ruff format src/ tests/ + uv run ruff check --fix src/ + uv run ruff format src/ typecheck: uv run mypy src/ diff --git a/src/proxy_pool/accounts/models.py b/src/proxy_pool/accounts/models.py index c57ea6b..ff07e86 100644 --- a/src/proxy_pool/accounts/models.py +++ b/src/proxy_pool/accounts/models.py @@ -9,7 +9,7 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship from proxy_pool.db.base import Base, TimestampMixin, UUIDPrimaryKeyMixin -class CreditTxType(str, enum.Enum): +class CreditTxType(str, enum.StrEnum): PURCHASE = "purchase" ACQUIRE = "acquire" REFUND = "refund" diff --git a/src/proxy_pool/proxy/models.py b/src/proxy_pool/proxy/models.py index a7ffd5c..d1faf7f 100644 --- a/src/proxy_pool/proxy/models.py +++ b/src/proxy_pool/proxy/models.py @@ -18,20 +18,20 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship from proxy_pool.db.base import Base, TimestampMixin, UUIDPrimaryKeyMixin -class ProxyProtocol(str, enum.Enum): +class ProxyProtocol(str, enum.StrEnum): HTTP = "http" HTTPS = "https" SOCKS4 = "socks4" SOCKS5 = "socks5" -class ProxyStatus(str, enum.Enum): +class ProxyStatus(str, enum.StrEnum): UNCHECKED = "unchecked" ACTIVE = "active" DEAD = "dead" -class AnonymityLevel(str, enum.Enum): +class AnonymityLevel(str, enum.StrEnum): TRANSPARENT = "transparent" ANONYMOUS = "anonymous" ELITE = "elite"