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

[7782] django upgrade #910

Merged
merged 7 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
23 changes: 12 additions & 11 deletions changelog/7782.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
### Updated

- Django from 3.2.19 to 4.0
- apps: remove deprecated app config in apps init
- settings: LN10N is now enabled by default
- templates: ifequal not supported
- Django from 3.2.19 to 4.0 (#7782)
- apps: remove deprecated app config in apps init
- settings: LN10N is now enabled by default
- templates: ifequal not supported

- Django from 4.0 to 4.1
- apps: added max_length in multiselectfield to fix index error with
validators[0]=MaxValueMultiFieldValidator(self.max_length)
- apps: added migration for wagtail custom renditions
- Django from 4.0 to 4.1 (#7782)
- apps: added max_length in multiselectfield to fix index error with
validators[0]=MaxValueMultiFieldValidator(self.max_length)
- apps: added migration for wagtail custom renditions

- Django from 4.1 to 4.2
- site-packages: update taggit to v4.
Should update to latest version when compatible with wagtail to fix index_together deprecation
- Django from 4.1 to 4.2 (#7782)
- site-packages: update taggit to v4
Should update to latest version when compatible with wagtail to fix index_together deprecation
goapunk marked this conversation as resolved.
Show resolved Hide resolved
- requirements: update psycopg to v3
3 changes: 1 addition & 2 deletions digitalstrategie/templates/includes/upper_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ <h3 class="heading js-trigger">{{ menuitem.title }}</h3>
{% get_language_info for 'de-ls' as language %}
{% get_has_translation page 'de_ls' as has_translation_de_ls %}
<li>
<!-- following might not working bcz of django 4.0 doesn’t set the user language in request.session-->
<form class="footer-menu__btn" action="{% url 'set_language' %}" method="post"
<form class="footer-menu__btn" action="{% url 'set_language' %}" method="post">
{% csrf_token %}
<input name="next" type="hidden" value="{% if has_translation_de_ls %}{{ redirect_to }}{% else %}/{% endif %}" />
<input name="language" type="hidden" value="{{ language.code }}">
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ isort==5.12.0
pytest-cov==4.1.0
pytest-django==4.6.0
pytest==7.4.3
psycopg2-binary==2.9.9
psycopg-binary==3.1.12
Copy link
Contributor

Choose a reason for hiding this comment

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

need psycopg[binary]== here

django-debug-toolbar==4.2.0
2 changes: 1 addition & 1 deletion requirements/prod.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-r base.txt
psycopg2==2.9.9
psycopg==3.1.12
Copy link
Contributor

Choose a reason for hiding this comment

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

should now be psycopg[c]==

Copy link
Contributor Author

Choose a reason for hiding this comment

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

[c]?

Copy link
Contributor

Choose a reason for hiding this comment

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