Bump versions in pre-commit config

.pre-commit-config.yaml

@@ -1,20 +1,29 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 23.1.0
     hooks:
     - id: black
       exclude: ^core/migrations
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.11.5
     hooks:
       - id: isort
         args: ["--profile", "black"]
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 6.0.0
     hooks:
       - id: flake8
         args: [--max-line-length=88]
         exclude: ^core/migrations
+  - repo: https://github.com/rtts/djhtml
+    rev: v2.0.0
+    hooks:
+      - id: djhtml
+        args: [-t 2]
+      - id: djcss
+        exclude : ^core/static/css # slow
+      - id: djjs
+        exclude: ^core/static/js # slow
   - repo: https://github.com/sirwart/ripsecrets.git
     rev: v0.1.5
     hooks:

handler/app.py

@@ -10,12 +10,14 @@ import lib.logstash
 import lib.markets
 import lib.money
 import lib.transactions
+
 # New style classes
 import sinks
 import sources
 import util
 import ux
 from klein import Klein
+
 # Project imports
 from settings import settings
 from twisted.internet import reactor

handler/db.py

@@ -1,6 +1,7 @@
 # Other library imports
 import util
 from redis import StrictRedis
+
 # Project imports
 from settings import settings
 

handler/lib/agoradesk_py.py

@@ -7,6 +7,7 @@ from typing import Any, Dict, List, Optional, Union
 
 import arrow
 import treq
+
 # Project imports
 import util
 from twisted.internet.defer import inlineCallbacks
@@ -675,7 +676,6 @@ class AgoraDesk:
         amount: Optional[float] = None,
         page: Optional[int] = None,
     ) -> Dict[str, Any]:
-
         # pylint: disable=too-many-arguments
 
         add_to_api_method = ""

handler/lib/localbitcoins_py.py

@@ -13,6 +13,7 @@ from urllib.parse import urlparse
 import arrow
 import requests
 import treq
+
 # Project imports
 import util
 from twisted.internet.defer import inlineCallbacks
@@ -725,7 +726,6 @@ class LocalBitcoins:
         amount: Optional[float] = None,
         page: Optional[int] = None,
     ) -> Dict[str, Any]:
-
         # pylint: disable=too-many-arguments
 
         add_to_api_method = ""

handler/lib/logstash.py

@@ -3,6 +3,7 @@ import logging
 from json import dumps
 
 import logstash
+
 # Project imports
 from settings import settings
 

handler/lib/markets.py

@@ -3,6 +3,7 @@ from json import loads
 
 import db
 import util
+
 # Project imports
 from settings import settings
 

handler/lib/money.py

@@ -7,8 +7,10 @@ import util
 from forex_python.converter import CurrencyRates
 from lib.logstash import send_logstash
 from opensearchpy import OpenSearch
+
 # Other library imports
 from pycoingecko import CoinGeckoAPI
+
 # Project imports
 from settings import settings
 from twisted.internet.defer import inlineCallbacks

handler/lib/transactions.py

@@ -6,6 +6,7 @@ from string import ascii_uppercase
 
 import db
 import util
+
 # Project imports
 from settings import settings
 from twisted.internet.defer import inlineCallbacks

handler/sinks/__init__.py

@@ -6,6 +6,7 @@ import sinks.nordigen
 import sinks.truelayer
 import util
 from db import r
+
 # Project imports
 from settings import settings
 

handler/sinks/nordigen.py

@@ -6,10 +6,18 @@ from json import dumps, loads
 import requests
 import treq
 import util
-from lib.serde.nordigen import (AccessToken, AccountBalancesRoot,
+from lib.serde.nordigen import (
-                                AccountDetails, Agreement, Institutions,
+    AccessToken,
-                                RequisitionResponse, Requisitions, TXRoot)
+    AccountBalancesRoot,
+    AccountDetails,
+    Agreement,
+    Institutions,
+    RequisitionResponse,
+    Requisitions,
+    TXRoot,
+)
 from serde import ValidationError
+
 # Project imports
 from settings import settings
 from simplejson.errors import JSONDecodeError

handler/sinks/truelayer.py

@@ -8,6 +8,7 @@ import requests
 import util
 from lib.serde.truelayer import AccountBalancesRoot
 from serde import ValidationError
+
 # Project imports
 from settings import settings
 from simplejson.errors import JSONDecodeError

handler/sources/agora.py

@@ -1,7 +1,9 @@
 # Twisted/Klein imports
 import sources.local
+
 # Other library imports
 from pyotp import TOTP
+
 # Project imports
 from settings import settings
 from twisted.internet.defer import inlineCallbacks

handler/sources/local.py

@@ -1,5 +1,6 @@
 # Twisted/Klein imports
 from datetime import datetime
+
 # Other library imports
 from json import loads
 from time import sleep  # TODO: async
@@ -9,6 +10,7 @@ import util
 from lib.agoradesk_py import AgoraDesk
 from lib.localbitcoins_py import LocalBitcoins
 from lib.logstash import send_logstash
+
 # Project imports
 from settings import settings
 from twisted.internet.defer import inlineCallbacks

handler/sources/localbitcoins.py

@@ -2,6 +2,7 @@
 import sources.local
 import util
 from pyotp import TOTP
+
 # Project imports
 from settings import settings
 

handler/tests/test_lbtc.py

@@ -10,8 +10,7 @@ import settings
 import sources
 import sources.localbitcoins
 import util
-from tests.common import (cg_prices, expected_to_update_lbtc,
+from tests.common import cg_prices, expected_to_update_lbtc, fake_public_ads_lbtc
-                          fake_public_ads_lbtc)
 from twisted.internet.defer import inlineCallbacks
 
 

handler/util.py

@@ -3,6 +3,7 @@ import logging
 from datetime import datetime, timezone
 
 from httpx import ReadError, ReadTimeout, RemoteProtocolError
+
 # Project imports
 from settings import settings
 
@@ -48,7 +49,6 @@ class ColoredFormatter(logging.Formatter):
 
 
 def get_logger(name):
-
     # Define the logging format
     FORMAT = "%(asctime)s %(levelname)18s $BOLD%(name)13s$RESET  - %(message)s"
     COLOR_FORMAT = formatter_message(FORMAT, True)

handler/ux/commands.py

@@ -2,6 +2,7 @@
 from json import dumps, loads
 
 import db
+
 # Project imports
 from settings import settings
 

handler/ux/irc.py

@@ -1,5 +1,6 @@
 # Twisted/Klein imports
 import util
+
 # Project imports
 from settings import settings
 from twisted.internet import protocol, reactor, ssl

handler/ux/notify.py

@@ -1,6 +1,7 @@
 # Other library imports
 import requests
 import util
+
 # Project imports
 from settings import settings
 

handler/ux/verify.py

@@ -6,6 +6,7 @@ import time
 
 import requests
 import util
+
 # Project imports
 from settings import settings