Merge lp://staging/~roadmr/isitdeployable/django-1.7-upgrade into lp://staging/isitdeployable

Proposed by Daniel Manrique
Status: Merged
Approved by: Daniel Manrique
Approved revision: 226
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp://staging/~roadmr/isitdeployable/django-1.7-upgrade
Merge into: lp://staging/isitdeployable
Diff against target: 2490 lines (+399/-1658)
24 files modified
checklist/migrations/0001_initial.py (+0/-86)
checklist/migrations/0002_auto__add_field_step_description.py (+0/-46)
django_project/settings_base.py (+3/-1)
django_project/wsgi.py (+2/-1)
requirements.txt (+7/-8)
revtracker/api_helpers.py (+1/-1)
revtracker/migrations/0001_initial.py (+0/-62)
revtracker/migrations/0002_auto__add_field_revision_rolled_back_by.py (+0/-42)
revtracker/migrations/0003_auto__add_field_revision_committer__add_unique_revision_project_revno.py (+0/-85)
revtracker/migrations/0004_auto__add_field_revision_parent__add_field_revision_branch.py (+0/-87)
revtracker/migrations/0005_auto__del_unique_revision_project_revno__add_unique_revision_project_r.py (+0/-87)
revtracker/migrations/0006_auto__add_field_project_sourcedeps_path.py (+0/-82)
revtracker/migrations/0007_auto__add_field_project_no_qa_of_main_branch.py (+0/-83)
revtracker/migrations/0008_auto__add_deploymentrequest__add_unique_deploymentrequest_project_depl.py (+0/-110)
revtracker/migrations/0009_auto__add_field_deploymentrequest_completer.py (+0/-95)
revtracker/migrations/0010_auto__chg_field_revision_branch.py (+0/-95)
revtracker/migrations/0011_auto__add_field_project_description.py (+0/-96)
revtracker/migrations/0012_auto__add_field_project_deployment_checklist.py (+0/-105)
revtracker/migrations/0013_add_git_support.py (+0/-121)
revtracker/templates/no_group.html (+1/-1)
revtracker/templating.py (+1/-1)
revtracker/tests/__init__.py (+4/-361)
revtracker/tests/test_views_logged_in.py (+378/-0)
revtracker/wsgi.py (+2/-2)
To merge this branch: bzr merge lp://staging/~roadmr/isitdeployable/django-1.7-upgrade
Reviewer Review Type Date Requested Status
Matt Goodall (community) Approve
Review via email: mp+308470@code.staging.launchpad.net

Commit message

Updates isitdeployable to Django 1.7.

1.7 uses native migrations (bye-bye south) and has a saner test runner.

I didn't go all the way to 1.8 because the comments application is not available anymore, so we'll need to look into a replacement which is a bit more work.

Note that at deployment time, we may need to manually load the fixtures in an app unit:

make manage ARGS='loaddata fixtures/group'

Description of the change

Updates isitdeployable to Django 1.7.

1.7 uses native migrations (bye-bye south) and has a saner test runner.

I didn't go all the way to 1.8 because the comments application is not available anymore, so we'll need to look into a replacement which is a bit more work (actually perhaps just adding https://github.com/django/django-contrib-comments but I chose to have a more focused branch which doesn't muck with the apps too much).

Note that at deployment time, we may need to manually load the fixtures in an app unit:

make manage ARGS='loaddata fixtures/group'

This depends on https://code.launchpad.net/~roadmr/isitdeployable-dependencies/deps-django-1.7 being merged into the dependencies branch.

The only two remaining deprecation warnings (at test run time) are:

/src/isitdeployable/working/virtualenv/local/lib/python2.7/site-packages/django/contrib/comments/__init__.py:13: RemovedInDjango18Warning: django.contrib.comments is deprecated and will be removed before Django 1.8.
  warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", RemovedInDjango18Warning)

/src/isitdeployable/working/virtualenv/local/lib/python2.7/site-packages/ordered_model/admin.py:19: RemovedInDjango18Warning: Options.module_name has been deprecated in favor of model_name
  model=self.model._meta.module_name)

To post a comment you must log in.
Revision history for this message
Matt Goodall (matt-goodall) wrote :

Looks good overall, but a couple on inline comments/questions.

Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks for the review!

Replied below, will push 2 fixes per comments and there's a third set of possible changes pending, though see my reply/rationale.

224. By Daniel Manrique

Use JSONSerializer. Because it's 2016.

225. By Daniel Manrique

Rename to RevTrackerTestCase to avoid confusion

Revision history for this message
Matt Goodall (matt-goodall) :
Revision history for this message
Matt Goodall (matt-goodall) wrote :

lgtm, with optional comment about serializer setting.

review: Approve
226. By Daniel Manrique

Revert to PickleSerializer. Because even in 2016, python-openid apparently still pickles things. How 20th century.

Revision history for this message
Daniel Manrique (roadmr) wrote :

Long reply below, I'll hold off on merging this until you ack, because tl;dr we can't use JSONSerializer here :(

Revision history for this message
Matt Goodall (matt-goodall) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches