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

[Python3 and Django2.2 upgrade] part 4 - Upgrade to Django 2.2 #682

Merged
merged 79 commits into from
Mar 12, 2021

Conversation

noliveleger
Copy link
Contributor

No description provided.

- Removed deprecated SessionMiddleware
- Remove DATA_UPLOAD_MAX_NUMBER_FIELDS from config
- Remove DATA_UPLOAD_MAX_NUMBER_FIELDS from config
- Use pip-tools for pip dependencies
…3-django2

 # Conflicts:
 #	Dockerfile
 #	docker/run_uwsgi.bash
…orts

 # Conflicts:
 #	onadata/apps/api/tools.py
 #	onadata/apps/main/views.py
 #	onadata/libs/permissions.py
 #	onadata/libs/serializers/metadata_serializer.py
 #	onadata/libs/serializers/xform_serializer.py
 #	onadata/libs/utils/export_tools.py
 #	onadata/libs/utils/user_auth.py
…-py3-remove-extend-object

 # Conflicts:
 #	onadata/apps/api/viewsets/xform_list_api.py
 #
 # It looks like you may be committing a merge.
 # If this is not correct, please remove the file
 #	.git/MERGE_HEAD
 # and try again.
…3-django2

 # Conflicts:
 #	dependencies/pip/requirements.in
 #	onadata/apps/api/tools.py
 #	onadata/apps/logger/models/xform.py
 #	onadata/apps/logger/views.py
 #	onadata/libs/serializers/metadata_serializer.py
@noliveleger noliveleger requested a review from jnm March 4, 2021 18:43
@noliveleger noliveleger changed the title [Python3 and Django2.2 upgrade] part 6 - Upgrade to Django 2.2 [Python3 and Django2.2 upgrade] part 4 - Upgrade to Django 2.2 Mar 4, 2021
Base automatically changed from kobocat2.0-step3-remove-objects-inheritance to beta March 12, 2021 00:55
@jnm jnm merged commit 0314ba3 into beta Mar 12, 2021
@jnm jnm deleted the kobocat2.0-step4-upgrade-django2.2 branch March 12, 2021 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants