Revert test changes and relock

ocadotechnology · Sep 5, 2024 · a8c5b1d · a8c5b1d
1 parent 5fbb72b
commit a8c5b1d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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