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

Update to Django 3.2 (for TUP CMS) #626

Merged
merged 17 commits into from
May 3, 2023
Merged

Update to Django 3.2 (for TUP CMS) #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5bc986f
Update to Django 3.2
Apr 14, 2023
c25bd05
chore: update taccsite_custom to main
wesleyboar Apr 22, 2023
1eb2c2e
chore: update taccsite_custom to main
wesleyboar Apr 22, 2023
1bdc946
Merge branch 'main' into django/2to3
wesleyboar Apr 22, 2023
1e4cca1
feat: finish renaming example-cms to example_cms
wesleyboar Apr 22, 2023
c0ea298
Merge branch 'django/2to3' of github.com:TACC/Core-CMS into django/2to3
wesleyboar Apr 22, 2023
fb38178
Update to Django 3.2
Apr 14, 2023
7e29297
feat(taccsite_custom): …-cms|org → …_cms|org
wesleyboar May 1, 2023
6640fde
feat(taccsite_custom): …-cms|org → …_cms|org
wesleyboar May 1, 2023
0b3bf32
fix: django 3.0 staticfiles deprecated, use static
wesleyboar May 1, 2023
dbec0c0
chore: django 2.0 postgresql_psycopg2 → postgresql
wesleyboar May 1, 2023
0cc65d1
chore: django 4.0 ifequal → if
wesleyboar May 1, 2023
89ac22a
Merge branch 'django/2to3' into django/2to3--tup-cms
wesleyboar May 1, 2023
7391a7a
chore: prevent app configuration error
wesleyboar May 1, 2023
c961a56
Merge branch 'django/2to3' into django/2to3--tup-cms
wesleyboar May 1, 2023
ec394ca
Merge branch 'dev/tup-cms' into django/2to3--tup-cms
wesleyboar May 1, 2023
35eb6fc
fix: TUP-477, set X_FRAME_OPTIONS like django 2 (for TUP CMS) (#631)
wesleyboar May 3, 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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV PYTHONUNBUFFERED 1

# https://python-poetry.org/docs/configuration/#using-environment-variables
ENV POETRY_VERSION=1.2.0 \
ENV POETRY_VERSION=1.4.0 \
POETRY_HOME="/opt/poetry" \
POETRY_VIRTUALENVS_IN_PROJECT=true \
POETRY_NO_INTERACTION=1 \
Expand Down
2 changes: 1 addition & 1 deletion apps/custom_example/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


class CustomExampleConfig(AppConfig):
name = 'custom_example'
name = 'apps.custom_example'
2 changes: 1 addition & 1 deletion docker-compose.example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
# HACK: No confirmed support for dir globbing, so block all of `static/`
- /code/taccsite_cms/static
# CAVEAT: CMS projects must add a line to ignore thier `...build/` dirs
- /code/taccsite_custom/example-cms/static
- /code/taccsite_custom/example_cms/static

postgres:
extends:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
# HACK: No confirmed support for dir globbing, so block all of `static/`
- /code/taccsite_cms/static
# CAVEAT: CMS projects must add a line to ignore thier `...build/` dirs
- /code/taccsite_custom/example-cms/static
- /code/taccsite_custom/example_cms/static

postgres:
extends:
Expand Down
Loading