.ansible-lint

@@ -1,3 +0,0 @@
-skip_list:
-  - command-instead-of-shell  # Use shell only when shell functionality is required
-  - experimental  # all rules tagged as experimental

.gitlab-ci.yml

@@ -36,20 +36,6 @@ linters:
   # Be nice to new contributors, but please use `tox`
   allow_failure: true
 
-# Ansible linter
-ansible-linter:
-  stage: quality-assurance
-  image: otthorn/nk20_ci_ansiblelint
-  script: ansible-lint ansible/
-
-# Docker linter
-docker-linter:
-  stage: quality-assurance
-  image: hadolint/hadolint
-  script:
-    - hadolint -c .hadolint Dockerfile
-    - hadolint -c .hadolint docker_ci/Dockerfile.*
-
 # Compile documentation
 documentation:
   stage: docs

.hadolint

@@ -1,4 +0,0 @@
-ignored:
-  - DL3008  # Do not force to pin version in apt (Debian)
-  - DL3013  # Do not force to pin version in pip (PyPI)
-  - DL3018  # Do not force to pin version in apk (Alpine)

apps/note/models/transactions.py

@@ -223,8 +223,7 @@ class Transaction(PolymorphicModel):
         # Check that the amounts stay between big integer bounds
         diff_source, diff_dest = self.validate()
 
-        if not (hasattr(self, '_force_save') and self._force_save) \
-                and (not self.source.is_active or not self.destination.is_active):
+        if not self.source.is_active or not self.destination.is_active:
             raise ValidationError(_("The transaction can't be saved since the source note "
                                     "or the destination note is not active."))
 
@@ -272,7 +271,7 @@ class RecurrentTransaction(Transaction):
     )
 
     def clean(self):
-        if self.template.destination != self.destination and not (hasattr(self, '_force_save') and self._force_save):
+        if self.template.destination != self.destination:
             raise ValidationError(
                 _("The destination of this transaction must equal to the destination of the template."))
         return super().clean()

apps/note/signals.py

@@ -43,5 +43,4 @@ def delete_transaction(instance, **_kwargs):
     """
     if not hasattr(instance, "_no_signal"):
         instance.valid = False
-        instance._force_save = True
         instance.save()

apps/scripts

@@ -1 +1 @@
-Subproject commit 8ec7d68a169c1072aec427925f3bf2fd54eab5a3
+Subproject commit dbe7bf65917df40b0ce476f357d04726e20b406f

apps/treasury/models.py

@@ -381,11 +381,6 @@ class SogeCredit(models.Model):
             tr.valid = True
             tr.created_at = timezone.now()
             tr.save()
-        if self.credit_transaction:
-            # If the soge credit is deleted while the user is not validated yet,
-            # there is not credit transaction.
-            # There is a credit transaction iff the user declares that no bank account
-            # was opened after the validation of the account.
         self.credit_transaction.valid = False
         self.credit_transaction.reason += " (invalide)"
         self.credit_transaction.save()

docker_ci/Dockerfile.ansiblelint

@@ -1,10 +0,0 @@
-FROM python:3.9-alpine
-
-LABEL maintainer="otthorn@crans.org"
-LABEL description="Alpine image with ansible-lint and yamllint \
-installed for linting purposes"
-
-RUN apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo
-RUN pip install --no-cache-dir "yamllint>=1.26.0,<2.0"
-RUN pip install --no-cache-dir "ansible-lint==5.0.0"
-RUN pip install --no-cache-dir "ansible>=2.10,<2.11"

docker_ci/Dockerfile.tox

@@ -1,8 +0,0 @@
-FROM alpine:3.13
-
-LABEL maintainer="otthorn@crans.org"
-LABEL description="Alpine image with tox \
-installed for linting purposes"
-
-RUN apk --no-cache add py3-pip=20.3.4-r0
-RUN pip install --no-cache-dir tox==3.22.0

docker_ci/TODO.md

@@ -0,0 +1,16 @@
+## TODO
+- Créer les images
+- Build les images
+- Push les images sur la docker registery de mon choix (docker hub
+  probablement)
+- Tester la CI avec les images pré construite pour voir tout fonctionnne comme
+  avant
+- Créer une CI pour les images docker elle meme (hadolin)
+- Créer une CI pour les images docker de la note
+- Créer une CI pour ansible
+- Créer la MR
+- Demande de merge de la MR
+
+## Optionnel
+- build automatique des images par la CI
+- utiliser le gitlab registery local une fois qu'il sera activé