Reformat with newer black version

.gitlab-ci.yml

@@ -82,7 +82,7 @@ caramel:pylint:
   image: ${PYTHON_IMAGE}
   before_script:
     - pip3 install pylint pylint-exit
-    - python3 setup.py develop
+    - pip3 install -e .
   script:
       - pylint --rcfile=setup.cfg caramel/ tests/ || pylint-exit --error-fail $?
 

Makefile

@@ -72,24 +72,24 @@ ca-cert%: $(CARAMEL_TOOL)
 
 # Start caramel using pserve in the background, save PID to SERVER
 $(SERVER)-env.pid: ca-cert-env gen-db-env
-	@ $(BOLD); echo "Start new caramel server in the background, sleep 2s to \
+	@ $(BOLD); echo "Start new caramel server in the background, sleep 5s to \
 	give it time to start";\
 	$(BLR)
 	chmod +x scripts/caramel_launcher.sh
 	setsid ./scripts/caramel_launcher.sh $(VENV)/bin/pserve >/dev/null 2>&1 < /dev/null & \
 	echo $$! > $(SERVER)-env.pid
-	sleep 2s
+	sleep 5s
 	@$(BLR)
 
 
 # Start caramel using pserve in the background, save PID to SERVER
 $(SERVER)-in%.pid: ca-cert-in% gen-db-in%
-	@ $(BOLD); echo "Start new caramel server in the background, sleep 2s to \
+	@ $(BOLD); echo "Start new caramel server in the background, sleep 5s to \
 	give it time to start";\
 	$(BLR)
 	setsid $(VENV)/bin/pserve $(CARAMEL_COMMAND_LINE) >/dev/null 2>&1 < /dev/null & \
 	echo $$! > $(SERVER)-in$*.pid
-	sleep 2s
+	sleep 5s
 	@$(BLR)
 
 # Start caramel_autosign in the background, save PID to ENV_AUTOSIGN

caramel/config.py

@@ -221,7 +221,7 @@ def get_log_level(argument_level, logger=None, env=None):
         logger = logging.getLogger()
     current_level = logger.level
 
-    argument_verbosity = logging.ERROR - argument_level * 10    # level steps are 10
+    argument_verbosity = logging.ERROR - argument_level * 10  # level steps are 10
     verbosity = min(argument_verbosity, env_level, current_level)
     log_level = (
         verbosity if logging.DEBUG <= verbosity <= logging.ERROR else logging.ERROR

caramel/models.py

@@ -2,10 +2,7 @@
 # vim: expandtab shiftwidth=4 softtabstop=4 tabstop=17 filetype=python :
 
 import sqlalchemy as _sa
-from sqlalchemy.ext.declarative import (
-    declared_attr,
-    as_declarative
-)
+from sqlalchemy.ext.declarative import declared_attr, as_declarative
 import sqlalchemy.orm as _orm
 from zope.sqlalchemy import register
 
@@ -92,7 +89,7 @@ def _fkcolumn(referent, *args, **kwargs):
 class Base(object):
     @declared_attr  # type: ignore
     def __tablename__(cls) -> str:  # pylint: disable=no-self-argument
-        return cls.__name__.lower() # pylint: disable=no-member
+        return cls.__name__.lower()  # pylint: disable=no-member
 
     id = _sa.Column(_sa.Integer, primary_key=True)
 

caramel/views.py

@@ -28,7 +28,7 @@
 # 2 kbyte should be enough for up to 4 kbit keys.
 # XXX: This should probably be handled outside of app (i.e. by the
 #      server), or at least be configurable.
-_MAXLEN = 2 * 2 ** 10
+_MAXLEN = 2 * 2**10
 
 
 def raise_for_length(req, limit=_MAXLEN):
@@ -38,7 +38,7 @@ def raise_for_length(req, limit=_MAXLEN):
     if length is None:
         raise HTTPLengthRequired
     if length > limit:
-        raise HTTPRequestEntityTooLarge("Max size: {0} kB".format(limit / 2 ** 10))
+        raise HTTPRequestEntityTooLarge("Max size: {0} kB".format(limit / 2**10))
 
 
 def raise_for_subject(components, required_prefix):