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.

Sign up for GitHub

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

Task/TUP-454: Upgrade to Django v4.2 #324

Merged
merged 4 commits into from
Sep 27, 2023
Merged

Task/TUP-454: Upgrade to Django v4.2 #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4075b3c
Use Django 4 CMS image and update imports
Sep 20, 2023
61251b4
fix: django-admin-styles, djangocms-forms
wesleyboar Sep 21, 2023
e7b70b6
docs: more accurate comment
wesleyboar Sep 21, 2023
164f247
Merge branch 'main' into task/TUP-454--django-4
wesleyboar Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/tup-cms/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TACC/Core-CMS#v3.12.0-beta.3
FROM taccwma/core-cms:aba079b
# TACC/Core-CMS#707 (sans commits irrelevant to TACC) (v3.12.0-beta.4 candidate)
FROM taccwma/core-cms:1f7b95d
Copy link
Member

@wesleyboar wesleyboar Sep 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Though there have been changes since 1f7b95d in TACC/Core-CMS#707, those changes1 an inconsequential to https://github.com/TACC/tup-ui/. Let's keep this commit has, because we tested it.

Footnotes

  1. The changes are (fixes) relevant to other projects that use https://github.com/TACC/Core-CMS. ↩


WORKDIR /code

Expand Down
2 changes: 1 addition & 1 deletion apps/tup-cms/docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
- tup_cms_net

postgres:
image: postgres:11.5
image: postgres:14.9
environment:
- POSTGRES_PASSWORD=taccforever
- POSTGRES_USER=postgresadmin
Expand Down
2 changes: 1 addition & 1 deletion apps/tup-cms/src/apps/user_news/cms_plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from cms.plugin_pool import plugin_pool

from django.utils.translation import gettext_lazy as _
from django.utils.encoding import force_text
from django.utils.encoding import force_str as force_text

from .defaults import max_articles, urls
from .utils import get_latest_articles
Expand Down
2 changes: 1 addition & 1 deletion apps/tup-cms/src/taccsite_cms/urls_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.urls import path, include

from django.conf.urls import url
from django.urls import re_path as url
from apps.user_news.urls import urls as user_news_urls
from django.views.generic.base import RedirectView

Expand Down