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 1 - Use Python 3 & Django 1.11 #678

Merged
merged 86 commits into from
Mar 12, 2021

Conversation

noliveleger
Copy link
Contributor

related to #602

Tests don't pass (anymore), but pass in Django 2.2 related branches (part 4, 5, 6)

- Replaced `is_anonymous()` with `is_anonymous`
- Replaced `is_authenticated()` with `is_authenticated`
- Replaced `detail_route` and `list_route` with `action_route`
- Replaced `make_option` in management command with `add_argument`
- Use imports in url patterns (instead of string imports)
- Changed INSTALLED_APP order
- typo `@action_route` instead of `@action`
- Use djangorestframework_guardian package for
DjangoObjectPermissionsFilter
- Use `io.StringIO` instead of `StringIO.StringIO`
- Moved redis session settings to prod settings
- Added explicit "fields" property to serializers
- Used force_bytes() and smart_str() when needed
- Removed deprecated assertDictContains
 # Conflicts:
 #	kobocat-template/templates/map.html
 #	kobocat-template/templates/show.html
 #	onadata/apps/api/tests/viewsets/test_abstract_viewset.py
 #	onadata/apps/main/templates/show.html
 #	onadata/apps/main/templates/show_form_settings.html
 #	onadata/apps/main/tests/test_form_metadata.py
 #	onadata/apps/main/tests/test_user_settings.py
 #	onadata/libs/serializers/password_reset_serializer.py
 #	onadata/libs/tests/serializers/test_password_reset_serializer.py
…en-py3

 # Conflicts:
 #	kobocat-template/templates/data_view.html
 #	kobocat-template/templates/instance.html
 #	kobocat-template/templates/map.html
 #	kobocat-template/templates/show.html
 #	kobocat-template/templates/stats_tables.html
 #	kobocat-template/templates/topbar.html
 #	onadata/apps/api/tests/viewsets/test_abstract_viewset.py
 #	onadata/apps/api/tests/viewsets/test_xform_viewset.py
 #	onadata/apps/api/viewsets/xform_viewset.py
 #	onadata/apps/logger/models/xform.py
 #	onadata/apps/logger/templates/list_xforms.html
 #	onadata/apps/logger/templates/submission.html
 #	onadata/apps/logger/views.py
 #	onadata/apps/main/forms.py
 #	onadata/apps/main/google_doc.py
 #	onadata/apps/main/google_export.py
 #	onadata/apps/main/models/google_oath.py
 #	onadata/apps/main/registration_urls.py
 #	onadata/apps/main/templates/activity.html
 #	onadata/apps/main/templates/getting_started.html
 #	onadata/apps/main/templates/profile.html
 #	onadata/apps/main/templates/published_surveys.html
 #	onadata/apps/main/templates/settings.html
 #	onadata/apps/main/templates/show.html
 #	onadata/apps/main/templates/show_form_settings.html
 #	onadata/apps/main/templates/tutorial.html
 #	onadata/apps/main/tests/test_base.py
 #	onadata/apps/main/tests/test_form_api.py
 #	onadata/apps/main/tests/test_form_api_delete.py
 #	onadata/apps/main/tests/test_form_enter_data.py
 #	onadata/apps/main/tests/test_form_errors.py
 #	onadata/apps/main/tests/test_form_metadata.py
 #	onadata/apps/main/tests/test_form_permissions.py
 #	onadata/apps/main/tests/test_form_show.py
 #	onadata/apps/main/tests/test_google_doc.py
 #	onadata/apps/main/tests/test_google_docs_export.py
 #	onadata/apps/main/tests/test_process.py
 #	onadata/apps/main/tests/test_user_settings.py
 #	onadata/apps/main/urls.py
 #	onadata/apps/main/views.py
 #	onadata/apps/sms_support/autodoc.py
 #	onadata/apps/sms_support/parser.py
 #	onadata/apps/sms_support/tests/test_base_sms.py
 #	onadata/apps/sms_support/tools.py
 #	onadata/apps/survey_report/templates/survey_report/auto_report.html
 #	onadata/apps/survey_report/templates/survey_report/auto_report_split_by.html
 #	onadata/apps/survey_report/templates/survey_report/export_html.html
 #	onadata/apps/survey_report/templates/survey_report/export_menu.html
 #	onadata/apps/survey_report/templatetags/data_manipulation.py
 #	onadata/apps/survey_report/urls.py
 #	onadata/apps/survey_report/views.py
 #	onadata/apps/viewer/templates/charts.html
 #	onadata/apps/viewer/templates/data_view.html
 #	onadata/apps/viewer/templates/instance.html
 #	onadata/apps/viewer/templates/map.html
 #	onadata/apps/viewer/templates/stats_tables.html
 #	onadata/apps/viewer/tests/test_export_builder.py
 #	onadata/apps/viewer/views.py
 #	onadata/koboform/redirect_middleware.py
 #	onadata/libs/serializers/xform_serializer.py
 #	onadata/libs/templates/home_topbar.html
 #	onadata/libs/templates/topbar.html
 #	onadata/libs/utils/analyser_export.py
 #	onadata/libs/utils/export_tools.py
 #	onadata/libs/utils/google.py
 #	onadata/settings/common.py
…en-py3

 # Conflicts:
 #	kobocat-template/templates/show.html
…en-py3

 # Conflicts:
 #	onadata/apps/api/tests/viewsets/test_data_viewset.py
 #	onadata/apps/api/tests/viewsets/test_xform_viewset.py
 #	onadata/apps/api/viewsets/xform_list_api.py
 #	onadata/apps/logger/models/xform.py
 #	onadata/apps/viewer/models/data_dictionary.py
 #	onadata/libs/serializers/xform_serializer.py
 #	onadata/libs/utils/export_tools.py
 #	onadata/libs/utils/user_auth.py
….0-step1-upgrade-python3-django1.11

 # Conflicts:
 #	onadata/apps/logger/templates/submission.html
 #	onadata/apps/logger/views.py
Base automatically changed from kobocat2.0-step0-remove-deprecated-views to beta March 11, 2021 20:51
@jnm jnm merged commit e2113e6 into beta Mar 12, 2021
@jnm jnm deleted the kobocat2.0-step1-upgrade-python3-django1.11 branch March 12, 2021 00:52
JacquelineMorrissette added a commit that referenced this pull request May 18, 2021
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.

2 participants