fix all files using pre-commit

.nvmrc

@@ -0,0 +1 @@
+16.*

Dockerfile

@@ -1,4 +1,4 @@
-# Production static resource building 
+# Production static resource building
 # Currently moved to makefile for development
 
 # FROM node:lts-buster-slim AS jsdeps
@@ -20,7 +20,7 @@ ARG ENV="prod"
 ENV ENV="${ENV}" \
     PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1\
-    PATH="${PATH}:/home/tamato/.local/bin" 
+    PATH="${PATH}:/home/tamato/.local/bin"
 
 # don't run as root
 RUN groupadd -g 1000 tamato && \

Makefile

@@ -10,7 +10,7 @@ DB_DUMP?=${PROJECT}_db.sql
 DB_NAME?=${PROJECT}
 DB_USER?=postgres
 DATE=$(shell date '+%Y_%m_%d')
-TEMPLATE_NAME?="${DB_NAME}_${DATE}" 
+TEMPLATE_NAME?="${DB_NAME}_${DATE}"
 
 -include .env
 export
@@ -20,7 +20,7 @@ SPHINXOPTS    ?=
 .PHONY: help clean clean-bytecode clean-static collectstatic compilescss dependencies \
 	 docker-clean docker-deep-clean docker-down docker-up-db docker-down docker-image \
 	 docker-db-dump docker-test node_modules run test test-fast docker-makemigrations \
-	 docker-checkmigrations docker-migrate build-docs docker-restore-db docker-import-new-db 
+	 docker-checkmigrations docker-migrate build-docs docker-restore-db docker-import-new-db
 
 
 
@@ -118,7 +118,7 @@ docker-test-fast:
 	@echo
 	@echo "> Running tests in docker..."
 	@${COMPOSE_LOCAL} ${DOCKER_RUN} \
-		${PROJECT} ${PYTHON} -m pytest -x -n=auto --dist=loadfile 
+		${PROJECT} ${PYTHON} -m pytest -x -n=auto --dist=loadfile
 
 ## clean-docs: Clean the generated documentation files
 clean-docs:
@@ -134,15 +134,15 @@ build-docs html:
 ## docker-clean: clean unused images and volumes
 docker-clean:
 	@echo
-	@echo "> Cleaning unused images in docker..."	
+	@echo "> Cleaning unused images in docker..."
 	@${DOCKER} image prune -a -f
-	@echo "> Cleaning unused volumes in docker..."	
-	@${DOCKER} volume prune -f 
+	@echo "> Cleaning unused volumes in docker..."
+	@${DOCKER} volume prune -f
 
 ## docker-deep-clean: deep clean all unused systems (containers, networks, images, cache)
 docker-deep-clean:
 	@echo
-	@echo "> Cleaning unused systems in docker..."	
+	@echo "> Cleaning unused systems in docker..."
 	@${DOCKER} system prune -a
 
 ## docker-down: shut down services in Docker
@@ -154,38 +154,38 @@ docker-down:
 ## docker-up-db: shut down services in Docker
 docker-up-db:
 	@echo
-	@echo "> Running db in docker..."	
+	@echo "> Running db in docker..."
 	@${COMPOSE_LOCAL} up -d db
-	@echo 
+	@echo
 	@echo "Waiting for database \"ready for connections\""
-	@sleep 15; 
+	@sleep 15;
 	@echo "Database Ready for connections!"
 
-## docker-import-new-db: Import new db DB_DUMP into new TEMPLATE_NAME in Docker container db must be running 
+## docker-import-new-db: Import new db DB_DUMP into new TEMPLATE_NAME in Docker container db must be running
 docker-import-new-db: docker-up-db
-	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "DROP DATABASE ${TEMPLATE_NAME}" || true  
-	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "CREATE DATABASE ${TEMPLATE_NAME} TEMPLATE template0"  
+	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "DROP DATABASE ${TEMPLATE_NAME}" || true
+	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "CREATE DATABASE ${TEMPLATE_NAME} TEMPLATE template0"
 	@echo "> Running db dump: ${DB_DUMP}  in docker..."
-	@cat ${DB_DUMP} | ${COMPOSE_LOCAL} exec -T db psql  -U ${DB_USER} -d ${TEMPLATE_NAME} 	
-	@sleep 5; 
+	@cat ${DB_DUMP} | ${COMPOSE_LOCAL} exec -T db psql  -U ${DB_USER} -d ${TEMPLATE_NAME}
+	@sleep 5;
 
-## docker-restore-db: Resotre db in Docker container set DB_NAME to rename db must be running  
+## docker-restore-db: Resotre db in Docker container set DB_NAME to rename db must be running
 docker-restore-db: docker-down docker-up-db
-	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "DROP DATABASE ${DB_NAME}" || true  
-	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "CREATE DATABASE ${DB_NAME} TEMPLATE ${TEMPLATE_NAME}"  
+	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "DROP DATABASE ${DB_NAME}" || true
+	@${COMPOSE_LOCAL} exec -u ${DB_USER} db psql -c "CREATE DATABASE ${DB_NAME} TEMPLATE ${TEMPLATE_NAME}"
 	@sleep 5;
 
 ## docker-db-dump: Run db dump to import data into Docker
 docker-db-dump: docker-up-db
 	@echo "> Running db dump in docker..."
-	@cat ${DB_DUMP} | ${COMPOSE_LOCAL} exec -T db psql -U ${DB_USER} -d ${DB_NAME} 	
+	@cat ${DB_DUMP} | ${COMPOSE_LOCAL} exec -T db psql -U ${DB_USER} -d ${DB_NAME}
 
-## docker-first-use: Run application for first time in Docker 
+## docker-first-use: Run application for first time in Docker
 docker-first-use: docker-down docker-clean node_modules compilescss docker-build docker-import-new-db \
-	docker-restore-db docker-migrate docker-superuser docker-up 
+	docker-restore-db docker-migrate docker-superuser docker-up
 
 ## docker-makemigrations: Run django makemigrations in Docker
-docker-makemigrations: 
+docker-makemigrations:
 	@echo
 	@echo "> Running makemigrations in docker..."
 	@${COMPOSE_LOCAL} ${DOCKER_RUN} \

checks/tests/test_tasks.py

@@ -56,7 +56,7 @@ def check(request):
     assert num_completed >= num_successful
 
     check = factories.TransactionCheckFactory.create(
-        **{trait: True for trait in traits}
+        **{trait: True for trait in traits},
     )
     check_names = [str(i) for i in range(num_checks)]
     completes = repeat(True, num_completed)

commodities/import_handlers.py

@@ -106,7 +106,7 @@ def get_absorbed_into_goods_nomenclature_link(self, model, kwargs):
         ):
             previous = (
                 models.GoodsNomenclatureSuccessor.objects.filter(
-                    **{key: self.data[key] for key in self.identifying_fields}
+                    **{key: self.data[key] for key in self.identifying_fields},
                 )
                 .latest_approved()
                 .get()
@@ -144,7 +144,7 @@ def create_missing_goods_nomenclature_description_period(
         goods_nomenclature_description_handler,
     ):
         """
-        in some circumstances, we will receive an EU update that will reference
+        In some circumstances, we will receive an EU update that will reference
         a historic description period, and since TAP does not track SIDs
         currently for this data we cant resolve the reference.
 

commodities/models/dc.py

@@ -911,7 +911,10 @@ def to_transaction(self, workbasket: WorkBasket) -> TrackedModel:
 
         with workbasket.new_transaction(order=order) as transaction:
             return self.obj.new_version(
-                workbasket, transaction, update_type=self.update_type, **attrs
+                workbasket,
+                transaction,
+                update_type=self.update_type,
+                **attrs,
             )
 
     def _get_preemptive_transaction_order(self, workbasket: WorkBasket) -> int:
@@ -1693,7 +1696,9 @@ def __init__(self, **kwargs):
 
 
 def get_tracked_model_reflection(
-    obj: TrackedModel, transaction: Transaction = None, **overrides
+    obj: TrackedModel,
+    transaction: Transaction = None,
+    **overrides,
 ):
     """
     Returns a reflection of a TrackedModel object.

commodities/tests/conftest.py

@@ -166,7 +166,9 @@ def create_collection(
 
 
 def create_record(
-    transaction_pool: Iterator[Transaction], factory, **kwargs
+    transaction_pool: Iterator[Transaction],
+    factory,
+    **kwargs,
 ) -> TrackedModel:
     """
     Returns a new TrackedModel instance.
@@ -179,7 +181,9 @@ def create_record(
 
 
 def create_dependent_measure(
-    commodity: Commodity, transaction_pool: Iterator[Transaction], **kwargs
+    commodity: Commodity,
+    transaction_pool: Iterator[Transaction],
+    **kwargs,
 ) -> Measure:
     """Returns a new measure linked to a given good."""
     factory = factories.MeasureFactory
@@ -190,7 +194,9 @@ def create_dependent_measure(
 
 
 def create_footnote_association(
-    commodity: Commodity, transaction_pool: Iterator[Transaction], **kwargs
+    commodity: Commodity,
+    transaction_pool: Iterator[Transaction],
+    **kwargs,
 ) -> FootnoteAssociationGoodsNomenclature:
     """Returns a new footnote association linked to a given good."""
     factory = factories.FootnoteAssociationGoodsNomenclatureFactory

common/business_rules.py

@@ -133,7 +133,8 @@ def get_linked_models(
         :param model TrackedModel: Get models linked to this model instance
         :param transaction Transaction: Get latest approved versions of linked
             models as of this transaction
-        :rtype Iterator[TrackedModel]: The linked models
+        :return: The linked models
+        :rtype: Iterator[TrackedModel]
         """
         for field, related_model in get_relations(type(model)).items():
             business_rules = getattr(related_model, "business_rules", [])
@@ -169,9 +170,11 @@ def violation(
         """
         Create a violation exception object.
 
-        :param model Optional[TrackedModel]: The model that violates this business rule
-        :param message Optional[str]: A message explaining the violation
-        :rtype BusinessRuleViolation: An exception indicating a business rule violation
+        :param model Optional[TrackedModel]: The model that violates this
+        business rule :param message Optional[str]: A message explaining the
+        violation
+        :rtype BusinessRuleViolation: An exception indicating a business rule
+            violation
         """
 
         return getattr(self.__class__, "Violation", BusinessRuleViolation)(
@@ -185,7 +188,7 @@ def only_applicable_after(cutoff: Union[date, datetime, str]):
     Decorate BusinessRules to make them only applicable after a given date.
 
     :param cutoff Union[date, datetime, str]: The date, datetime or isoformat
-        date string of the time before which the rule should not apply
+    date string of the time before which the rule should not apply
     """
 
     if isinstance(cutoff, str):
@@ -226,8 +229,10 @@ def skip_when_update_type(cls: Type[BusinessRule], update_types: Iterable[Update
     """
     Skip business rule validation for given update types.
 
-    :param cls Type[BusinessRule]: The BusinessRule to decorate
-    :param update_types Iterable[int]: The UpdateTypes to skip
+    :param cls: The BusinessRule to decorate
+    :type cls: Type[BusinessRule]
+    :param update_types: The UpdateTypes to skip
+    :type update_types: Iterable[int]
     """
     _original_validate = cls.validate
 
@@ -336,7 +341,8 @@ def validate(self, model):
         Check whether the specified model violates this business rule.
 
         :param model TrackedModel: The model to check
-        :raises BusinessRuleViolation: Raised if the passed model violates this business rule.
+        :raises BusinessRuleViolation: Raised if the passed model violates this
+            business rule.
         """
         if self.has_violation(model):
             raise self.violation(model)

common/fields.py

@@ -100,7 +100,10 @@ class TaricDateRangeField(DateRangeField):
     range_type = TaricDateRange
 
     def from_db_value(
-        self, value: Union[DateRange, TaricDateRange], *_args, **_kwargs
+        self,
+        value: Union[DateRange, TaricDateRange],
+        *_args,
+        **_kwargs,
     ) -> TaricDateRange:
         """
         By default Django ignores the range_type and just returns a Psycopg2

common/migrations/0002_transaction_partition_1_of_3.py

@@ -8,17 +8,18 @@ class Migration(migrations.Migration):
     """
     Transaction partition field 1 of 3.
 
-    1/3 Create Partition field, with partition defaulting to (1, SEED), as at the time of writing most of
-    Transactions are from the seed file.
-
-    2/3 Data migration to set Transaction partitions to (2, REVISION) and (3, DRAFT). REVISION:  Before this
-    migration was written REVISION transactions are contained in workbaskets after the first workbasket with approved
-    workbasket status. After this migration was written data schemas allow more control over SEED / REVISION
-    transactions. DRAFT:   Draft Transactions are inferred by checking for transactions not in the first workbasket
-    that lack an approved workbasket status..
-
-    3/3
-    Set the default value to (3, DRAFT)
+    1/3 Create Partition field, with partition defaulting to (1, SEED), as at
+    the time of writing most of Transactions are from the seed file.
+
+    2/3 Data migration to set Transaction partitions to (2, REVISION) and (3,
+    DRAFT). REVISION:  Before this migration was written REVISION transactions
+    are contained in workbaskets after the first workbasket with approved
+    workbasket status. After this migration was written data schemas allow more
+    control over SEED / REVISION transactions. DRAFT:   Draft Transactions are
+    inferred by checking for transactions not in the first workbasket that lack
+    an approved workbasket status..
+
+    3/3 Set the default value to (3, DRAFT)
     """
 
     dependencies = [

common/migrations/0003_transaction_partition_2_of_3.py

@@ -42,17 +42,18 @@ class Migration(migrations.Migration):
     """
     Transaction partition field 2 of 3.
 
-    1/3 Create Partition field, with partition defaulting to (1, SEED), as at the time of writing most of
-    Transactions are from the seed file.
-
-    2/3 Data migration to set Transaction partitions to (2, REVISION) and (3, DRAFT). REVISION:  Before this
-    migration was written REVISION transactions are contained in workbaskets after the first workbasket with approved
-    workbasket status. After this migration was written data schemas allow more control over SEED / REVISION
-    transactions. DRAFT:   Draft Transactions are inferred by checking for transactions not in the first workbasket
-    that lack an approved workbasket status..
-
-    3/3
-    Set the default value to (3, DRAFT)
+    1/3 Create Partition field, with partition defaulting to (1, SEED), as at
+    the time of writing most of Transactions are from the seed file.
+
+    2/3 Data migration to set Transaction partitions to (2, REVISION) and (3,
+    DRAFT). REVISION:  Before this migration was written REVISION transactions
+    are contained in workbaskets after the first workbasket with approved
+    workbasket status. After this migration was written data schemas allow more
+    control over SEED / REVISION transactions. DRAFT:   Draft Transactions are
+    inferred by checking for transactions not in the first workbasket that lack
+    an approved workbasket status..
+
+    3/3 Set the default value to (3, DRAFT)
     """
 
     dependencies = [

common/migrations/0004_transaction_partition_3_of_3.py

@@ -8,17 +8,18 @@ class Migration(migrations.Migration):
     """
     Transaction partition field 3 of 3.
 
-    1/3 Create Partition field, with partition defaulting to (1, SEED), as at the time of writing most of
-    Transactions are from the seed file.
-
-    2/3 Data migration to set Transaction partitions to (2, REVISION) and (3, DRAFT). REVISION:  Before this
-    migration was written REVISION transactions are contained in workbaskets after the first workbasket with approved
-    workbasket status. After this migration was written data schemas allow more control over SEED / REVISION
-    transactions. DRAFT:   Draft Transactions are inferred by checking for transactions not in the first workbasket
-    that lack an approved workbasket status..
-
-    3/3
-    Set the default value to (3, DRAFT)
+    1/3 Create Partition field, with partition defaulting to (1, SEED), as at
+    the time of writing most of Transactions are from the seed file.
+
+    2/3 Data migration to set Transaction partitions to (2, REVISION) and (3,
+    DRAFT). REVISION:  Before this migration was written REVISION transactions
+    are contained in workbaskets after the first workbasket with approved
+    workbasket status. After this migration was written data schemas allow more
+    control over SEED / REVISION transactions. DRAFT:   Draft Transactions are
+    inferred by checking for transactions not in the first workbasket that lack
+    an approved workbasket status..
+
+    3/3 Set the default value to (3, DRAFT)
     """
 
     dependencies = [

common/models/mixins/description.py

@@ -147,7 +147,7 @@ def get_descriptions(self) -> TrackedModelQuerySet:
         }
 
         query = descriptions_model.objects.filter(**filter_kwargs).order_by(
-            *descriptions_model._meta.ordering
+            *descriptions_model._meta.ordering,
         )
 
         return query.current()

common/models/tracked_qs.py

@@ -195,7 +195,11 @@ def version_ordering(self) -> TrackedModelQuerySet:
         return self.order_by("transaction__partition", "transaction__order")
 
     def _get_current_related_lookups(
-        self, model, *lookups, prefix="", recurse_level=0
+        self,
+        model,
+        *lookups,
+        prefix="",
+        recurse_level=0,
     ) -> List[str]:
         """
         Build a list of lookups for the current versions of related objects.
@@ -241,10 +245,14 @@ def with_latest_links(self, *lookups, recurse_level=0) -> TrackedModelQuerySet:
         run multiple queries for every current relation.
         """
         related_lookups = self._get_current_related_lookups(
-            self.model, *lookups, recurse_level=recurse_level
+            self.model,
+            *lookups,
+            recurse_level=recurse_level,
         )
         return self.select_related(
-            "version_group", "version_group__current_version", *related_lookups
+            "version_group",
+            "version_group__current_version",
+            *related_lookups,
         )
 
     def with_transactions_and_models(self) -> TrackedModelQuerySet: