[7776] django upgrade to 4.2 (LTS) #1504

m4ra · 2023-11-07T15:44:45Z

NOT merge until the other repos are ready

Django 4 has dropped support for sha1 hashes. The deprecation warning was there before Django v3.
From the release notes:

Support for the pre-Django 3.1 password reset tokens in the admin site (that use the SHA-1 hashing algorithm) will be removed.
Support for the pre-Django 3.1 django.core.signing.Signer signatures (encoded with the SHA-1 algorithm) will be removed.
Support for the pre-Django 3.1 django.core.signing.dumps() signatures (encoded with the SHA-1 algorithm) in django.core.signing.loads() will be removed.
Support for the pre-Django 3.1 user sessions (that use the SHA-1 algorithm) will be removed.

@goapunk will that affect existing passwords? or was it dealt previously while upgrading to 3.2? Cannot find if this is dealt by Django itself.
See transitional notes here, though is about updating multiple instances of same project.

Notes:
DONE: need to update django-allauth for 4.2

github-actions · 2023-11-07T15:49:21Z

Coverage report

Total coverage

Status	Category	Percentage	Covered / Total
🔴	Statements	12.85%	141/1097
🔴	Branches	14.86%	103/693
🔴	Functions	12.57%	44/350
🔴	Lines	20.58%	725/3523

Status of coverage: 🟢 - ok, 🟡 - slightly more than threshold, 🔴 - under the threshold

Report generated by 🧪jest coverage report action from ec5c807

goapunk · 2023-11-08T08:53:01Z

Django 4 has dropped support for sha1 hashes. The deprecation warning was there before Django v3. From the release notes:
* Support for the pre-Django 3.1 password reset tokens in the admin site (that use the SHA-1 hashing algorithm) will be removed.

* Support for the pre-Django 3.1 django.core.signing.Signer signatures (encoded with the SHA-1 algorithm) will be removed.

* Support for the pre-Django 3.1 django.core.signing.dumps() signatures (encoded with the SHA-1 algorithm) in django.core.signing.loads() will be removed.

* Support for the pre-Django 3.1 user sessions (that use the SHA-1 algorithm) will be removed.
@goapunk will that affect existing passwords? or was it dealt previously while upgrading to 3.2? Cannot find if this is dealt by Django itself. See transitional notes here, though is about updating multiple instances of same project.

Notes: need to update django-allauth for 4.2

I'm not entirely sure, but worst case the very few affected users would have to request a new password via forgot password. So I think that's ok. I also vaguely remember checking for passwords with old hashes in the db and didn't find any.

goapunk

@m4ra there are some instances of index_together which should be replaced with indexes as described here: https://docs.djangoproject.com/en/4.2/releases/4.2/#index-together-option-is-deprecated-in-favor-of-indexes

m4ra · 2023-11-27T13:09:35Z

@m4ra there are some instances of index_together which should be replaced with indexes as described here: https://docs.djangoproject.com/en/4.2/releases/4.2/#index-together-option-is-deprecated-in-favor-of-indexes
@goapunk done, and rebased. Please have another look.

goapunk

LGTM! One thing I missed previously, sorry: (but we can also fix this in a different PR). In tests/project/settings.py we can now also remove the USE_L10N option and get rid of the warning.

m4ra · 2023-11-28T14:03:51Z

adhocracy4/modules/models.py

@@ -95,7 +93,7 @@ class Module(models.Model):

    objects = ModulesQuerySet.as_manager()

-    blueprint_type = BlueprintTypeField(
+    blueprint_type = models.CharField(
        max_length=255,
        blank=True,
    )


then we delete the fields.py with the custom BlueprintType?
Also the new migration cancels the 0008. If we remove 0008, it won't generate 0009 here
@goapunk

goapunk · 2023-11-30T07:46:31Z

Makefile

@@ -45,15 +45,11 @@ lint:
 	$(VIRTUAL_ENV)/bin/isort --diff -c $(SOURCE_DIRS) ||  EXIT_STATUS=$$?; \
 	$(VIRTUAL_ENV)/bin/flake8 $(SOURCE_DIRS) --exclude migrations,settings ||  EXIT_STATUS=$$?; \
 	npm run lint ||  EXIT_STATUS=$$?; \
-	$(VIRTUAL_ENV)/bin/python manage.py makemigrations --dry-run --check --noinput || EXIT_STATUS=$$?; \


we don't need to remove these anymore, right?

goapunk · 2023-11-30T08:01:05Z

adhocracy4/categories/form_fields.py


 from adhocracy4.categories import get_category_icon_url


-class CategoryIconDict(abc.Mapping):


I'm not really sure why this was needed so I removed it, I think we should point out to testers to verify everything still works as intended with the icons

goapunk · 2023-11-30T13:45:30Z

adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py

+            for topic_code in project.topics:
+                project.m2mtopics.create(
+                    code=topic_code,
+                    name=[item[1] for item in topicsenum if item[0] == topic_code][0],


topicsenum -> topicenum

goapunk

Looks good to me, we only need changelogs for the latest changes (topics, categories?, blueprint_types?) and maybe some of my commits should be squashed

m4ra · 2023-12-04T15:45:57Z

Looks good to me, we only need changelogs for the latest changes (topics, categories?, blueprint_types?) and maybe some of my commits should be squashed

@goapunk done, have another look please.
FYI I kept the models changes related to choices in separate commits in case we need to revert.

goapunk

really nice!

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch from fd5a4f2 to dbe2d4e Compare November 8, 2023 08:47

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch from 29c6520 to 1aa189f Compare November 8, 2023 16:11

m4ra requested review from goapunk, philli-m and hom3mad3 November 8, 2023 16:12

goapunk requested changes Nov 27, 2023

View reviewed changes

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch 3 times, most recently from 28a41d5 to 384f584 Compare November 27, 2023 12:58

m4ra requested a review from goapunk November 27, 2023 13:08

goapunk approved these changes Nov 27, 2023

View reviewed changes

m4ra changed the title ~~WIP [7776] django upgrade to 4.2 (LTS)~~ [7776] django upgrade to 4.2 (LTS) Nov 27, 2023

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch from 384f584 to 2c77b8c Compare November 27, 2023 14:58

m4ra commented Nov 28, 2023

View reviewed changes

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch 2 times, most recently from 8e2b873 to 59fb1f8 Compare November 29, 2023 17:59

m4ra requested a review from goapunk November 29, 2023 18:11

m4ra added 6 commits November 29, 2023 18:17

deps: remove django-background-tasks

ffa5c0e

deps: django upgrade to 4.0

289ac0c

deps: django-allauth upgrade to 0.55.0

98fce3c

deps: django upgrade to 4.1

738623d

deps, models, views: django upgrade to 4.2

3434eec

deps: upgrade psycopg to 3.1.12

af1392c

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch from 59fb1f8 to 0735f13 Compare November 29, 2023 18:18

goapunk reviewed Nov 30, 2023

View reviewed changes

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch from 90b1927 to e7313f9 Compare December 4, 2023 12:22

m4ra requested a review from goapunk December 4, 2023 12:36

goapunk requested changes Dec 4, 2023

View reviewed changes

goapunk added 3 commits December 4, 2023 17:33

apps/modules: change module blueprint_type to char

dfd5391

apps/categories: change category choice field

8bb42e3

apps/projects: add topics as m2m relation

ec5c807

m4ra force-pushed the mk-2023-11-django-upgrade-4.2 branch from e7313f9 to ec5c807 Compare December 4, 2023 15:43

m4ra requested a review from goapunk December 4, 2023 15:44

goapunk approved these changes Dec 4, 2023

View reviewed changes

goapunk merged commit b3d2580 into main Dec 4, 2023
2 of 3 checks passed

goapunk deleted the mk-2023-11-django-upgrade-4.2 branch December 4, 2023 16:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[7776] django upgrade to 4.2 (LTS) #1504

[7776] django upgrade to 4.2 (LTS) #1504

m4ra commented Nov 7, 2023 •

edited

Loading

github-actions bot commented Nov 7, 2023 •

edited

Loading

goapunk commented Nov 8, 2023 •

edited

Loading

goapunk left a comment •

edited

Loading

m4ra commented Nov 27, 2023

goapunk left a comment

m4ra Nov 28, 2023 •

edited

Loading

goapunk Nov 30, 2023

goapunk Nov 30, 2023

goapunk Nov 30, 2023

goapunk left a comment

m4ra commented Dec 4, 2023

goapunk left a comment


		from adhocracy4.categories import get_category_icon_url


		class CategoryIconDict(abc.Mapping):

[7776] django upgrade to 4.2 (LTS) #1504

[7776] django upgrade to 4.2 (LTS) #1504

Conversation

m4ra commented Nov 7, 2023 • edited Loading

github-actions bot commented Nov 7, 2023 • edited Loading

Coverage report

Total coverage

goapunk commented Nov 8, 2023 • edited Loading

goapunk left a comment • edited Loading

Choose a reason for hiding this comment

m4ra commented Nov 27, 2023

goapunk left a comment

Choose a reason for hiding this comment

m4ra Nov 28, 2023 • edited Loading

Choose a reason for hiding this comment

goapunk Nov 30, 2023

Choose a reason for hiding this comment

goapunk Nov 30, 2023

Choose a reason for hiding this comment

goapunk Nov 30, 2023

Choose a reason for hiding this comment

goapunk left a comment

Choose a reason for hiding this comment

m4ra commented Dec 4, 2023

goapunk left a comment

Choose a reason for hiding this comment

m4ra commented Nov 7, 2023 •

edited

Loading

github-actions bot commented Nov 7, 2023 •

edited

Loading

goapunk commented Nov 8, 2023 •

edited

Loading

goapunk left a comment •

edited

Loading

m4ra Nov 28, 2023 •

edited

Loading