From a8c5b1dd27a9ee01db708cc87cb8c97beee7c196 Mon Sep 17 00:00:00 2001
From: faucomte97 <f.aucomte@hotmail.co.uk>
Date: Thu, 5 Sep 2024 14:05:22 +0100
Subject: [PATCH] Revert test changes and relock

---
 .github/workflows/ci.yml | 1 -
 Pipfile                  | 1 -
 Pipfile.lock             | 9 ++++++---
 run_testserver           | 1 -
 setup.py                 | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 365a6353f..efe010b3e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,6 @@ jobs:
         run: |
           pip install pipenv
           pipenv install --dev --system
-          pip install -U "git+https://github.com/ocadotechnology/rapid-router@sync_episode_names#egg=rapid-router"
           yarn --frozen-lockfile
       - name: Collect static
         run: python example_project/manage.py collectstatic --noinput --settings portal_test_settings
diff --git a/Pipfile b/Pipfile
index 179584dd0..65d2a5603 100644
--- a/Pipfile
+++ b/Pipfile
@@ -6,7 +6,6 @@ name = "pypi"
 [packages]
 codeforlife-portal = {path = ".", editable = true}
 cfl-common = {path = "./cfl_common", editable = true}
-rapid-router = {ref = "sync_episode_names", git = "https://github.com/ocadotechnology/rapid-router.git"}
 
 [dev-packages]
 django-selenium-clean = "==1.0.0"
diff --git a/Pipfile.lock b/Pipfile.lock
index ca3ebe99f..31e51eb02 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "d3f240149fb6a75b4125678e846e86828a595128665ac9d5bfcc79680d1d828d"
+            "sha256": "164e3bef474a2fa70671ac95377be239fd0098883de8d05b2991a0ce18c424fd"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -603,8 +603,11 @@
             "version": "==7.4.2"
         },
         "rapid-router": {
-            "git": "https://github.com/ocadotechnology/rapid-router.git",
-            "ref": "076a7085b8e3c97d155c3777b9a45140232c8122"
+            "hashes": [
+                "sha256:69b2b933f4c994610b8a3be244eb7d38ac4b81a569604c5a9d5eee4be1d4fbb7",
+                "sha256:c962147760b6a16d318fe5c865d287cef94f9d72017fcd46a643bda7e83375bd"
+            ],
+            "version": "==6.4.4"
         },
         "reportlab": {
             "hashes": [
diff --git a/run_testserver b/run_testserver
index 4ee9f3a55..d786ef2bd 100755
--- a/run_testserver
+++ b/run_testserver
@@ -2,6 +2,5 @@
 set -e
 cd "${BASH_SOURCE%/*}"
 
-./example_project/manage.py migrate --noinput
 ./example_project/manage.py collectstatic --noinput --clear
 ./example_project/manage.py testserver portal/tests/cypress/fixtures/teachersToBeDeleted.json --settings="portal_test_settings"
diff --git a/setup.py b/setup.py
index f39af7e02..ceb0a9452 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@
         "django-recaptcha==2.0.6",
         "pyyaml==6.0.2",
         "importlib-metadata==4.13.0",
+        "rapid-router>=6.3.6",
         "reportlab==3.6.13",
         "django-formtools==2.2",
         "django-otp==1.0.2",  # we needed to fix this due to a wide ranged dependency in django-two-factor-auth