fix: Upgrade dependencies (#1420)

* Specify versions of dependencies

* Install autoconfig fork

* Install correct RR branch

* Install master of django-autoconfig fork

* Install master branch

* Update yarn command in cypress flow

* Install correct branches

.github/workflows/ci.yml

@@ -21,9 +21,9 @@ jobs:
       run: |
         pip install pipenv
         pipenv install --dev --system
-        pip install -U git+https://github.com/ocadotechnology/rapid-router@django_2_0_test
-        pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade
-        pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade#egg=cfl-common&subdirectory=cfl_common"
+        pip install -U git+https://github.com/ocadotechnology/rapid-router@upgrade_dependencies
+        pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@upgrade_dependencies
+        pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@upgrade_dependencies#egg=cfl-common&subdirectory=cfl_common"
         cd game_frontend
         yarn --frozen-lockfile
     - name: Run Javascript tests

.github/workflows/cypress.yml

@@ -18,11 +18,11 @@ jobs:
         run: |
           pip install pipenv
           pipenv install --dev --system
-          pip install -U git+https://github.com/ocadotechnology/rapid-router@django_2_0_test
-          pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade
-          pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade#egg=cfl-common&subdirectory=cfl_common"
+          pip install -U git+https://github.com/ocadotechnology/rapid-router@upgrade_dependencies
+          pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@upgrade_dependencies
+          pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@upgrade_dependencies#egg=cfl-common&subdirectory=cfl_common"
           cd game_frontend
-          yarn install
+          yarn --frozen-lockfile
       - name: Build project and run server
         run: python ${{ github.workspace }}/run.py -c &
       - name: Cypress run

Pipfile

@@ -12,6 +12,7 @@ pytest-cov = "*"
 
 [packages]
 aimmo = {editable = true,path = "."}
+django-autoconfig = { git = 'https://github.com/ocadotechnology/django-autoconfig.git', ref = 'master', editable = true }
 kubernetes = "*"
 eventlet = "*"
 docker = "*"

setup.py

@@ -22,13 +22,12 @@
     package_dir={"aimmo": "aimmo"},
     include_package_data=True,
     install_requires=[
-        "django==2.2.*",
-        # "django-autoconfig >= 0.3.6, < 1.0.0",
-        "django-js-reverse",
+        "django==2.2.17",
+        "django-js-reverse==0.9.1",
         "djangorestframework==3.12.2",
         "eventlet==0.29.1",
-        "requests",
-        "hypothesis",
+        "requests==2.25.0",
+        "hypothesis==5.41.3",
         # "cfl-common",
     ],
     tests_require=["docker >= 3.5, < 3.6", "kubernetes == 5.0.0", "PyYAML == 4.2b1"],