Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Django 3.1 #3632

Merged
merged 25 commits into from
May 3, 2021
Merged

Upgrade to Django 3.1 #3632

merged 25 commits into from
May 3, 2021

Conversation

valentijnscholten
Copy link
Member

@valentijnscholten valentijnscholten commented Jan 15, 2021

2.0.0 is a nice moment to upgrade to Django 3.x.
3.2 was just released but has some bugs, so let's start with 3.1.7.

Modifications done (thanks @damiencarol for the help):

Some interesting items from the 3.x release notes:
image
image
image
image
image
image
image
image
image
image
image
image
image

@damiencarol
Copy link
Contributor

damiencarol commented Jan 16, 2021

Starting with Django 3.0.4,

from six import python_2_unicode_compatible

instead of

from django.utils.six import python_2_unicode_compatible

=> django-tastypie/django-tastypie@2700cdc#diff-62f0c99fd21d1d9da506e35b907a02710859dbbcc70322233e858a8be12dad4e

@valentijnscholten
Copy link
Member Author

don't waste time on it as tastypie will be removed soon.

@damiencarol
Copy link
Contributor

@valentijnscholten I think I was wrong. the only change for now is six that is not in Django anymore but a separate package.
So it could be only updating some package to versions compatible with Django 3.x branch.
At least for me it is worth a try.

@valentijnscholten
Copy link
Member Author

yes. but my proposal will be to do the upgrade as part of defect dojo 2.0 which will have some stuff removed like apiv1, setup.bash install method, some old django-tagging code, old permission system.
so if those are causing troubles it's a waste of time to fix those.
but of course you are welcome to try . on tuesday we'll discuss 2.0 in the meeting

@damiencarol
Copy link
Contributor

Deal. I will continue this test to have some insight for the 2.0 discussion. 👍

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@valentijnscholten valentijnscholten added this to the 2.0.0 milestone Apr 26, 2021
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@damiencarol damiencarol changed the title experiment: upgrade django 2.2 -> 3.1 Upgrade django 2.x to 3.x Apr 30, 2021
@github-actions
Copy link
Contributor

github-actions bot commented May 1, 2021

Conflicts have been resolved. A maintainer will review the pull request shortly.

@valentijnscholten valentijnscholten changed the title Upgrade django 2.x to 3.x Upgrade to Django 3.1 May 1, 2021
Copy link
Contributor

@damiencarol damiencarol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The final version is neat. I'm glad that we are finally able to get ride of the back-port :)

@github-actions
Copy link
Contributor

github-actions bot commented May 2, 2021

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

github-actions bot commented May 2, 2021

Conflicts have been resolved. A maintainer will review the pull request shortly.

@madchap madchap merged commit 1743c6b into DefectDojo:dev May 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants