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

Django 3.2 upgrade #667

Merged
merged 22 commits into from Sep 20, 2021
Merged

Conversation

marksweb
Copy link
Collaborator

This follows on from the django 2.2 upgrade, this time bringing django to 3.2.

@codecov-commenter
Copy link

Codecov Report

Merging #667 (9992142) into main (f374491) will increase coverage by 0.29%.
The diff coverage is 71.42%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #667      +/-   ##
==========================================
+ Coverage   76.98%   77.28%   +0.29%     
==========================================
  Files          88       88              
  Lines        2381     2390       +9     
  Branches      222      225       +3     
==========================================
+ Hits         1833     1847      +14     
+ Misses        496      490       -6     
- Partials       52       53       +1     
Impacted Files Coverage Δ
applications/views.py 68.38% <ø> (+1.29%) ⬆️
core/forms.py 88.37% <0.00%> (-2.33%) ⬇️
organize/views.py 70.21% <ø> (ø)
applications/admin.py 60.75% <40.00%> (ø)
applications/forms.py 72.83% <75.00%> (-3.71%) ⬇️
djangogirls/settings.py 80.68% <75.00%> (-0.28%) ⬇️
contact/forms.py 95.65% <80.00%> (-4.35%) ⬇️
applications/models.py 92.67% <100.00%> (ø)
coach/models.py 70.37% <100.00%> (ø)
core/templatetags/core_tags.py 60.00% <100.00%> (ø)
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f374491...9992142. Read the comment docs.

@marksweb
Copy link
Collaborator Author

This has been rebased with the translations changes.

@amakarudze
Copy link
Contributor

Hey, @marksweb. Let me know when this is ready for review. I keep seeing more changes to this PR. Or maybe we can wait until the errors brought about by 2.2 are resolved before we can move ahead?

@marksweb
Copy link
Collaborator Author

Hello @amakarudze

This was OK. Looks like coverage wasn't happy. Will see if I can rerun jobs.

All I recently did here was rebase the latest main I think.

@marksweb
Copy link
Collaborator Author

Ah I can see I've ended up with a version of Django countries here that's unsupported. Got old python 2 support refs to six

Will fix ASAP

@amakarudze
Copy link
Contributor

Ok @marksweb. Let me know when it's ready for review. Thanks

@marksweb
Copy link
Collaborator Author

@amakarudze ok checks passing again 👌👍

Copy link
Contributor

@amakarudze amakarudze left a comment

Choose a reason for hiding this comment

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

Everything looks good @marksweb. Thanks for all your work.

Just a question on the changed contact URL, why you thought of changing it - no need to change it back, by the way. Also maybe, it's high time we removed Opbeat settings in pytest.ini. See my comments.

contact/urls.py Show resolved Hide resolved
pytest.ini Show resolved Hide resolved
@amakarudze amakarudze merged commit c3126a1 into DjangoGirls:main Sep 20, 2021
@marksweb marksweb deleted the feature/628/django3 branch September 20, 2021 10:30
@amakarudze
Copy link
Contributor

Had to revert this @marksweb. See Sentry for the issues. Thanks

@amakarudze
Copy link
Contributor

I did run the migrations locally and they worked. We had some unapplied migrations on the server and running python manage.py makemigrations --merge as advised did not work. Had to revert the changes so we can continue serving the website while we figure this out.

@marksweb
Copy link
Collaborator Author

@amakarudze Ok thanks.

There's quite a lot on sentry to investigate. We really need a way to make python anymore more reliable. 😞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix RemovedInDjango30Warning: Remove the context parameter from ApproximateDateField.from_db_value().
3 participants