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

Upgrade to Django 3.2 #815

Merged
merged 11 commits into from
Aug 23, 2022
Merged

Upgrade to Django 3.2 #815

merged 11 commits into from
Aug 23, 2022

Conversation

noliveleger
Copy link
Contributor

@noliveleger noliveleger commented Apr 27, 2022

Description

Upgrade Django code to latest Django LTS

Additional info

  • PyMongo is still frozen to 3.12.3. 4.0.0 and above does not work with MockMongo.
  • Upgrade django-reversion to v5.0.0. (see https://django-reversion.readthedocs.io/en/stable/changelog.html#id9)
  • Add migrations to change logger.instance and viewer.parsed_instance id field to BigAutoField. May be very long on big tables?
  • Get rid of dependencies/pip/prod.* (move uWSGI in requirements.* as per internal discussion and match KPI requirements)

Related issues

closes #762

related to kobotoolbox/kobo-docker#335
related to kobotoolbox/kpi#3786

@noliveleger noliveleger changed the title WIP - Upgrade tp Django 3.2 WIP - Upgrade to Django 3.2 Apr 27, 2022
@noliveleger noliveleger changed the base branch from beta to upgrade-python-3.10 April 27, 2022 20:08
@noliveleger noliveleger changed the title WIP - Upgrade to Django 3.2 Upgrade to Django 3.2 Apr 27, 2022
@noliveleger noliveleger marked this pull request as draft April 27, 2022 20:21
@noliveleger noliveleger marked this pull request as ready for review April 27, 2022 20:33
@noliveleger noliveleger marked this pull request as draft April 27, 2022 20:34
@noliveleger noliveleger marked this pull request as ready for review April 27, 2022 21:51
@noliveleger noliveleger requested a review from jnm April 27, 2022 21:51
Base automatically changed from upgrade-python-3.10 to beta April 28, 2022 19:50
@noliveleger noliveleger force-pushed the upgrade-django3.2 branch from e519cc6 to 8c1ddd0 Compare May 3, 2022 18:00
@noliveleger noliveleger force-pushed the upgrade-django3.2 branch from 8c1ddd0 to 60f0453 Compare May 3, 2022 18:04
 # Conflicts:
 #	dependencies/pip/dev_requirements.txt
 #	dependencies/pip/prod.txt
 #	dependencies/pip/requirements.txt
 # Conflicts:
 #	dependencies/pip/prod.txt
 #	dependencies/pip/requirements.in
 #	onadata/apps/logger/models/instance.py
 #	onadata/settings/base.py
@@ -13,7 +13,7 @@ https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip#
-e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect

# Regular PyPI packages
Django>=2.2,<2.3
Django==3.2
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't use exact version of Django, use >=,< syntax

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🤦 I thought I already changed it when you made me change it in KPI.
Done!

Copy link
Contributor

@bufke bufke left a comment

Choose a reason for hiding this comment

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

Everything else looks good to me. I was able to run it on the latest kobo-install and upgraded django versions on both kpi and kc.

@noliveleger noliveleger removed the request for review from jnm August 16, 2022 13:21
@noliveleger noliveleger assigned bufke and unassigned jnm Aug 16, 2022
@noliveleger noliveleger requested a review from bufke August 16, 2022 13:21
@noliveleger noliveleger merged commit 5162bc8 into beta Aug 23, 2022
@noliveleger noliveleger deleted the upgrade-django3.2 branch August 23, 2022 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants