From 37f320744dcc6e9aa598235f6a0bdf090b0c3599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 22 Dec 2023 00:30:37 +0100
Subject: [PATCH 1/4] chore: cleanup CI

---
 .gitlab-ci.yml | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb20994..3331b69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,5 @@
 stages:
   - test
-  - docker
-  - deploy
 
 tests:
   stage: test
@@ -26,40 +24,10 @@ tests:
     - echo "Running tests..."
     - source $CACHE_PATH/venv/bin/activate
     - pip cache purge
-    - pip install -U -r requirements-dev.txt
+    - pip install -e ".[dev]"
     - pytest --create-db --cov --cov-report=xml
     - if [ "$CI_COMMIT_REF_NAME" = 'main' ] ; then exit 0 ; fi
     - if [ "$CI_COMMIT_REF_NAME" = 'develop' ] ; then git fetch origin main ; diff-cover coverage.xml --fail-under=90 --compare-branch origin/main --diff-range-notation '..' && exit 0 ; fi
     - git fetch origin develop ; diff-cover coverage.xml --fail-under=90 --compare-branch origin/develop --diff-range-notation '..'
     - echo "Tests done."
 
-build_docker_and_publish:
-  stage: docker
-  only:
-    - main
-    - develop
-  image: docker:git
-  tags:
-    - dind
-  services:
-    - docker:dind
-  script:
-    - docker build --pull --no-cache -f Dockerfile -t $CI_REGISTRY/hashbangfr/la_chariotte:${CI_COMMIT_REF_NAME}-latest .
-    - docker tag $CI_REGISTRY/hashbangfr/la_chariotte:${CI_COMMIT_REF_NAME}-latest $CI_REGISTRY/hashbangfr/la_chariotte:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push $CI_REGISTRY/hashbangfr/la_chariotte:${CI_COMMIT_REF_NAME}-latest
-    - docker push $CI_REGISTRY/hashbangfr/la_chariotte:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}
-
-ansible:
-  only:
-    refs:
-      - main
-      - develop
-  stage: deploy
-  image: $CI_REGISTRY/hashbangfr/docker_archlinux:ansible
-  tags:
-    - ansible
-  script:
-    - cd /srv/ansible/
-    - ansible-playbook ./playbooks/hb_chariotte/play-${CI_COMMIT_REF_NAME}.yml --extra-vars="CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA}"
-

From 98e73b748726ec21867ba4995d1b4411c71180ae Mon Sep 17 00:00:00 2001
From: pauline <pauline.attal8@gmail.com>
Date: Thu, 21 Dec 2023 21:56:34 +0100
Subject: [PATCH 2/4] add links doc and gitlab in footer

---
 la_chariotte/templates/base.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/la_chariotte/templates/base.html b/la_chariotte/templates/base.html
index f2bca14..f30b58a 100644
--- a/la_chariotte/templates/base.html
+++ b/la_chariotte/templates/base.html
@@ -126,6 +126,9 @@
         <p>
           <a href="{% url 'legal_notice' %}">Mentions légales</a>
         </p>
+        <p>
+          <a href="https://gitlab.com/your-repository">Code source</a> et <a href="https://docs.chariotte.fr/en/latest/">documentation</a>
+        </p>
       </div>
       <div class="column is-size-6 columns">
         <div class="column margin-auto">

From 7db8613f28c786dc53cf144771b14e212e7f9b92 Mon Sep 17 00:00:00 2001
From: pauline <pauline.attal8@gmail.com>
Date: Thu, 21 Dec 2023 22:04:35 +0100
Subject: [PATCH 3/4] correct mistake of link

---
 la_chariotte/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/la_chariotte/templates/base.html b/la_chariotte/templates/base.html
index f30b58a..7dde997 100644
--- a/la_chariotte/templates/base.html
+++ b/la_chariotte/templates/base.html
@@ -127,7 +127,7 @@
           <a href="{% url 'legal_notice' %}">Mentions légales</a>
         </p>
         <p>
-          <a href="https://gitlab.com/your-repository">Code source</a> et <a href="https://docs.chariotte.fr/en/latest/">documentation</a>
+          <a href="https://gitlab.com/la-chariotte/la_chariotte/">Code source</a> et <a href="https://docs.chariotte.fr/en/latest/">documentation</a>
         </p>
       </div>
       <div class="column is-size-6 columns">

From 8a38c5432f56c1092baca22772b51d4796516fa4 Mon Sep 17 00:00:00 2001
From: pauline <pauline.attal8@gmail.com>
Date: Thu, 21 Dec 2023 21:56:34 +0100
Subject: [PATCH 4/4] add links doc and gitlab in footer

---
 la_chariotte/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/la_chariotte/templates/base.html b/la_chariotte/templates/base.html
index 7dde997..8660767 100644
--- a/la_chariotte/templates/base.html
+++ b/la_chariotte/templates/base.html
@@ -127,7 +127,7 @@
           <a href="{% url 'legal_notice' %}">Mentions légales</a>
         </p>
         <p>
-          <a href="https://gitlab.com/la-chariotte/la_chariotte/">Code source</a> et <a href="https://docs.chariotte.fr/en/latest/">documentation</a>
+          <a href="https://gitlab.com/la-chariotte/la_chariotte/">Code source</a> et <a href="https://docs.chariotte.fr/">documentation</a>
         </p>
       </div>
       <div class="column is-size-6 columns">