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 4.1.x #3398

Merged
merged 16 commits into from
Nov 6, 2023
Merged

Upgrade to Django 4.1.x #3398

merged 16 commits into from
Nov 6, 2023

Conversation

theskumar
Copy link
Member

@theskumar theskumar commented May 9, 2023

  • Upgrade Django, wagtail-purge, Django-pwned-password,django-basic-auth-ip-whitelist
  • Move logic from DeleteView -> delete() to form_valid()
  • Make test more robust
  • Upgrade dj-database-url to 2.x, and enable CONN_HEALTH_CHECKS
  • Bump django-two-factor-auth to 1.15.x that has confirmed support for Django 4.1
  • Bump django-ratelimit to 4.1.0
  • django-pwned-passwords seems be abandoned Update to work with Django 4.0 jamiecounsell/django-pwned-passwords#11 (replaced with it with it's fork)

@theskumar theskumar requested a review from frjo May 9, 2023 09:25
@theskumar theskumar force-pushed the maintainance/django-4x branch from 5fd18b9 to d50dc8b Compare May 9, 2023 09:42
@theskumar theskumar changed the title maintainance/django 4x Upgrade to Django 4.1.x May 9, 2023
@theskumar theskumar force-pushed the maintainance/django-4x branch from 6220d85 to 62a8fb3 Compare May 14, 2023 08:36
@theskumar theskumar force-pushed the maintainance/django-4x branch from 6959070 to f90813b Compare July 25, 2023 08:16
@theskumar theskumar force-pushed the maintainance/django-4x branch from 99cc724 to cba8067 Compare July 25, 2023 08:28
@theskumar
Copy link
Member Author

Update: Rebased on main and use official release version of wagtail-purge=0.3.0

@theskumar
Copy link
Member Author

@frjo Update with main and resolved conflicts.

@frjo
Copy link
Member

frjo commented Oct 20, 2023

Test are failing, found this regarding SuccessURLAllowedHostsMixin:

  • The undocumented django.contrib.auth.views.SuccessURLAllowedHostsMixin
    mixin is replaced by RedirectURLMixin.

https://github.com/django/django/blob/21382e2743d06efbf5623e7c9b6dccf2a325669b/docs/releases/4.1.txt#L573-L574

@theskumar
Copy link
Member Author

theskumar commented Oct 20, 2023

Updated the code. The logic behind the SuccessURLAllowedHostsMixin is was already covered in the get_redirect_url mixin function.

@frjo frjo added Type: Maintenance Type: Minor Minor change, used in release drafter labels Oct 20, 2023
@theskumar
Copy link
Member Author

  • Upgrade dj-database-url to 2.x, and enable CONN_HEALTH_CHECKS
  • Bump django-two-factor-auth to 1.15.x that has confirmed support for Django 4.1
  • Bump django-ratelimit to 4.1.0

@frjo
Copy link
Member

frjo commented Oct 23, 2023

@theskumar I merge in a couple of you other update PRs so this one has a small merge conflict now.

Will run this on test for a some days to be sure but it seems good to go in my testing.

* origin/main:
  Remove depreciation warning for mkdocs material emoji support (#3626)
  Upgrade packages with patches/security updates (#3625)
@theskumar
Copy link
Member Author

Thanks for the quick merging. I've resolve the conflicts with main.

@theskumar
Copy link
Member Author

theskumar commented Oct 23, 2023

@frjo Would you be more comfortable if I stack the wagtail upgrade #3627 PR onto this django 4x PR? from testing perspective?

@frjo
Copy link
Member

frjo commented Oct 23, 2023

@theskumar Yes, I think it would be good to do the Wagtail 5 on top of Django 4. I think we can get this PR quickly tested and then merged in to main.

For Django 4.2.x LTS we need Wagtail 5 I believe. But that where I would like to go before the end of the year.

@theskumar
Copy link
Member Author

Done. Updated the base of the wagtail 5x to this PR.

@frjo frjo added the Status: Needs testing Tickets that need testing/qa label Oct 23, 2023
@frjo frjo merged commit ec48491 into main Nov 6, 2023
@frjo frjo added Status: Tested - approved for live ✅ and removed Status: Needs testing Tickets that need testing/qa labels Nov 6, 2023
theskumar added a commit that referenced this pull request Nov 7, 2023
* main:
  Custom applicant dashboard header (#3587)
  Upgrade wagtail to 5x (#3627)
  Upgrade to Django 4.1.x (#3398)
  docs: update the links to images and some references to pages (#3641)
  Update the query text on all.html (#3638)
  Update to  django-3.2.23. (#3637)
@theskumar theskumar deleted the maintainance/django-4x branch November 21, 2023 08:25
wes-otf pushed a commit that referenced this pull request May 7, 2024
- Upgrade Django, wagtail-purge,
Django-pwned-password,django-basic-auth-ip-whitelist
- Move logic from DeleteView -> delete() to form_valid()
- Make test more robust
- Upgrade dj-database-url to 2.x, and enable CONN_HEALTH_CHECKS
- Bump django-two-factor-auth to 1.15.x that has confirmed support for
Django 4.1
- Bump django-ratelimit to 4.1.0
- django-pwned-passwords seems be abandoned
jamiecounsell/django-pwned-passwords#11
(replaced with it with it's fork)
wes-otf pushed a commit that referenced this pull request May 8, 2024
- Upgrade Django, wagtail-purge,
Django-pwned-password,django-basic-auth-ip-whitelist
- Move logic from DeleteView -> delete() to form_valid()
- Make test more robust
- Upgrade dj-database-url to 2.x, and enable CONN_HEALTH_CHECKS
- Bump django-two-factor-auth to 1.15.x that has confirmed support for
Django 4.1
- Bump django-ratelimit to 4.1.0
- django-pwned-passwords seems be abandoned
jamiecounsell/django-pwned-passwords#11
(replaced with it with it's fork)
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.

2 participants