diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c145b1c9..4776065ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: pip install pipenv pipenv install --dev --system yarn --frozen-lockfile + pip install -U "git+https://github.com/ocadotechnology/rapid-router@remove_kurono#egg=rapid-router" - name: Collect static run: python example_project/manage.py collectstatic --noinput --settings portal_test_settings - name: Run Python tests diff --git a/Pipfile.lock b/Pipfile.lock index 8cd0b849f..0e4ff1ab2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -188,13 +188,6 @@ "markers": "python_version >= '3.8'", "version": "==4.1.1" }, - "django-js-reverse": { - "hashes": [ - "sha256:2a392d169f44e30b883c30dfcfd917a14167ce8fe196c99d2385b31c90d77aa0", - "sha256:8134c2ab6307c945edfa90671ca65e85d6c1754d48566bdd6464be259cc80c30" - ], - "version": "==0.9.1" - }, "django-otp": { "hashes": [ "sha256:8ba5ab9bd2738c7321376c349d7cce49cf4404e79f6804e0a3cc462a91728e18", @@ -467,14 +460,6 @@ "markers": "python_version >= '3.8'", "version": "==10.4.0" }, - "pyhamcrest": { - "hashes": [ - "sha256:412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316", - "sha256:7ead136e03655af85069b6f47b23eb7c3e5c221aa9f022a4fbb499f5b7308f29" - ], - "markers": "python_version >= '3.5'", - "version": "==2.0.2" - }, "pyjwt": { "hashes": [ "sha256:69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd", @@ -548,13 +533,6 @@ "markers": "python_version >= '3.7'", "version": "==7.4.2" }, - "rapid-router": { - "hashes": [ - "sha256:1a17b004cfe9601544d1c42c28242bb8cde5e291345ac6e87439152a6bc83218", - "sha256:a02b1cb39188ef917a5f534c0c39b70708b49022acdd6aa685f64b15150735b0" - ], - "version": "==5.27.0" - }, "reportlab": { "hashes": [ "sha256:0b94e4f65a5f77a631cc010c9a7892d69e33f3251b760639dcc76420e138ce95", diff --git a/setup.py b/setup.py index 6bfbc1f81..cd4856331 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ "django-recaptcha==2.0.6", "pyyaml==5.4.1", "importlib-metadata==4.13.0", - "rapid-router>=4", + # "rapid-router>=4", "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