Future-proof for django 4.0 #27

Open

bclement wants to merge 1 commit from bclement/future into main

bclement commented

2022-12-05 14:38:49 +01:00

(Migrated from git.eleves.ens.fr)

Minor changes to make the code compatible with django 4.0

Note that we can't actually upgrade to django 4.0 because that requires
python 3.8, and www.eleves only has python 3.7, so we need to upgrade
www.eleves first.

Minor changes to make the code compatible with django 4.0 Note that we can't actually upgrade to django 4.0 because that requires python 3.8, and www.eleves only has python 3.7, so we need to upgrade www.eleves first.

This pull request has changes conflicting with the target branch.

WikiENS/settings/common.py
WikiENS/urls.py
wiki_groups/__init__.py

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin bclement/future:bclement/future

git checkout bclement/future

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main

git merge --no-ff bclement/future

git checkout bclement/future

git rebase main

git checkout main

git merge --ff-only bclement/future

git checkout bclement/future

git rebase main

git checkout main

git merge --no-ff bclement/future

git checkout main

git merge --squash bclement/future