Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Commit

Permalink
feat!: Upgrade from Django 2.2 to 3.2 (#1631)
Browse files Browse the repository at this point in the history
* wip: upgrade to Django 3.2

* update setup test_requires

* patch ci to use upgrade-django branches

* more packages upgrades
  • Loading branch information
razvan-pro committed Mar 15, 2022
1 parent 837a651 commit c9faa1c
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 718 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ jobs:
run: |
pip install pipenv
pipenv install --dev --system
pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@upgrade-django#egg=cfl-common&subdirectory=cfl_common" # TODO remove after Django upgrade
pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@upgrade-django#egg=codeforlife-portal" # TODO remove after Django upgrade
pip install -U "git+https://github.com/ocadotechnology/rapid-router@upgrade-django#egg=rapid-router" # TODO remove after Django upgrade
cd game_frontend
yarn --frozen-lockfile
- name: Run Javascript tests
Expand Down
9 changes: 5 additions & 4 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ name = "pypi"

[dev-packages]
pytest = "~=6.2"
pytest-django = "==4.1.0"
pytest-django = "==4.5.2"
pytest-pythonpath = "*"
codeforlife-portal = "*"
# TODO uncomment after Django upgrade
# codeforlife-portal = "*"
pytest-cov = "*"
black = "*"
django-test-migrations = "==1.1.0"
django-test-migrations = "==1.2.0"

[packages]
aimmo = {editable = true,path = "."}
django-autoconfig = { git = 'https://github.com/ocadotechnology/django-autoconfig.git', ref = 'master' }
django-autoconfig = { git = 'https://github.com/ocadotechnology/django-autoconfig.git', ref = 'upgrade-django' }
kubernetes = "*"
eventlet = "*"
docker = "*"
Expand Down
Loading

0 comments on commit c9faa1c

Please sign in to comment.