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

Jump to bottom

Upgrade to Django 3.2 #1254

Merged
merged 31 commits into from
Mar 17, 2022
Merged

Upgrade to Django 3.2 #1254

merged 31 commits into from
Mar 17, 2022

Conversation

srugano
Copy link
Contributor

@srugano srugano commented Feb 4, 2022 •
edited
Loading

@srugano srugano requested review from saxix and johniak February 4, 2022 22:26
@johniak
Copy link
Contributor

johniak commented Feb 5, 2022

If the PR is ready for review, remove DRAFT from it

@johniak
Copy link
Contributor

johniak commented Feb 5, 2022

tests are failing

@johniak johniak closed this Feb 5, 2022
@johniak johniak reopened this Feb 5, 2022
@johniak
Copy link
Contributor

johniak commented Feb 17, 2022

After removing filters frontend stopped working, need to fix filters (mainly revert changes in filters) look at my example comit

@srugano
Copy link
Contributor Author

srugano commented Feb 17, 2022 •
edited
Loading

After removing filters frontend stopped working, need to fix filters (mainly revert changes in filters) look at my example comit

I'm testing re-adding them but, there is an error:

  1. I will have to downgrade django-filter because if it remains on v2.4.0, it would complain that: [TypeError: 'Meta.fields' must not contain non-model field names] (Error on non-model field with version 2.3.0 carltongibson/django-filter#1236)
  2. If I downgrade to v2.2.0 like it is in develop, I will have an error of importations like this one related to Django 3.1+ (https://stackoverflow.com/a/64708659) , which was addressed in v2.3.0 but also introduced incompatibility 1).
  3. The best way would be to fork django-filter v2.2.0 , add the fix and use it in the code. We will have time to upgrade frontend links and declare all the extra fields in the filters before migrating to v2.4.0. I think Stefano recommended that.
  4. There might be a fact that on v2.2.0 extra queries are silently ignored and that's why they had to migrate to v2.3.0. See

@patryk-dabrowski patryk-dabrowski marked this pull request as ready for review March 16, 2022 08:34
patryk-dabrowski and others added 2 commits March 16, 2022 10:00
@patryk-dabrowski
Fix black format
0c84ad1
@johniak
Merge branch 'develop' into django_upgrade_3.2
01d2baa 
# Conflicts:
#	backend/hct_mis_api/apps/account/migrations/0035_migration.py
#	backend/hct_mis_api/apps/payment/fixtures.py
#	backend/hct_mis_api/apps/payment/migrations/0031_migration.py
#	backend/hct_mis_api/apps/payment/models.py
#	backend/hct_mis_api/apps/payment/schema.py
#	backend/hct_mis_api/apps/payment/utils.py
#	backend/hct_mis_api/apps/program/admin.py
#	backend/hct_mis_api/apps/program/fixtures.py
#	backend/hct_mis_api/apps/program/schema.py
#	backend/poetry.lock
#	backend/pyproject.toml
@johniak johniak merged commit 4cb0b1e into develop Mar 17, 2022
@mmaciekk mmaciekk deleted the django_upgrade_3.2 branch August 29, 2022 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saxix saxix Awaiting requested review from saxix

@johniak johniak Awaiting requested review from johniak

@patryk-dabrowski patryk-dabrowski Awaiting requested review from patryk-dabrowski

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@srugano @johniak @patryk-dabrowski