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

Bump Django version to 4.2 #707

Merged
merged 12 commits into from
Sep 27, 2023
Merged

Bump Django version to 4.2 #707

merged 12 commits into from
Sep 27, 2023

Conversation

jarosenb
Copy link
Contributor

@jarosenb jarosenb commented Aug 28, 2023

Overview

Bump Django version to 4.2 and fix compatibility issues.
This uses a new fork of djangocms-forms that updates imports to deal with Django 4 deprecations: https://github.com/TACC/djangocms-forms

Related

Testing

  1. docker-compose -f docker-compose.yml build
  2. Run the CMS locally as per usual.

Notes

Repo Maintainer Notes

UI Demo is broken. That's expected, because of v3.12.0-beta.2. This branch is off of https://github.com/TACC/Core-CMS/releases/tag/v3.12.0-beta.2 (technically, off of two 006fc47, which is noop commits ahead of beta.2).
@wesleyboar

Copy link
Member

@wesleyboar wesleyboar left a comment

Choose a reason for hiding this comment

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

This is exciting.

Also, I only just noticed that the original fork recently begun Django 4 updates (avryhof/djangocms-forms#13).

Comparisons:

pyproject.toml Outdated
djangocms-forms-maintained = { git = "https://github.com/avryhof/djangocms-forms", rev = "d8a69efd2f447ee2f940c7b6f5b8b088c9cb79ed" }
djangocms-forms-maintained = { git = "https://github.com/TACC/djangocms-forms", rev = "95489d535b8e03c98fcbf9a3d848f1139c896241" }
Copy link
Member

@wesleyboar wesleyboar Aug 28, 2023

Choose a reason for hiding this comment

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

We might not need the TACC fork, because the original fork has similar (and more) updates for Django 4. Excellent work though. The work of both is similar.

P.S. I prefer your use of as when importing to make a cleaner diff.

Copy link
Member

@wesleyboar wesleyboar Sep 21, 2023

Choose a reason for hiding this comment

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

The original fork's dajngo4 branch has no PR, and no Issue. Gross. Also it is 63 commits ahead of upstream, while its master branch is 64 commits ahead. That's just weird. At least TACC's version is a commit on master. So, we stick with TACC, sure.

Only oddity of sticking with TACC is that the trail is unexpectedly long:

@jarosenb How about removing jarosenb link in the chain? Or make PR to avryhof/djangocms-forms?

Copy link
Member

@wesleyboar wesleyboar left a comment

Choose a reason for hiding this comment

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

The Bootstrap revision worries me. I cannot find a paper trail.

pyproject.toml Outdated Show resolved Hide resolved
docker-compose.dev.yml Outdated Show resolved Hide resolved
taccsite_cms/settings.py Show resolved Hide resolved
@wesleyboar wesleyboar added the priority ▲▲ Very high priority label Sep 11, 2023
Copy link
Member

@wesleyboar wesleyboar left a comment

Choose a reason for hiding this comment

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

Re-review notes.

docker-compose.example-cms.yml Outdated Show resolved Hide resolved
pyproject.toml Show resolved Hide resolved
@wesleyboar wesleyboar mentioned this pull request Sep 20, 2023
@wesleyboar
Copy link
Member

Note
The merge of main (0992f47) means deploying this on TUP will also get unreleased changes. But, that should be okay, because the changes are docs, submodule, noop, and one new not-yet-enabled feature.

pyproject.toml Outdated Show resolved Hide resolved
Copy link
Member

@wesleyboar wesleyboar left a comment

Choose a reason for hiding this comment

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

Latest Issues:

  1. Form submission failure. This is being investigated (private link).
  2. Update djamgo-admin-style to latest to fix UI bugs (source).
  3. Failure to create page on new local setup.

Copy link
Member

@wesleyboar wesleyboar left a comment

Choose a reason for hiding this comment

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

@wesleyboar wesleyboar merged commit e20c1c9 into main Sep 27, 2023
@wesleyboar wesleyboar deleted the django/3to4 branch September 27, 2023 19:47
wesleyboar added a commit that referenced this pull request Sep 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority ▲▲ Very high priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants