Merge lp://staging/~twom/canonical-identity-provider/django-1.11 into lp://staging/canonical-identity-provider/release
Proposed by
Tom Wardill
| Status: | Merged |
|---|---|
| Approved by: | Tom Wardill |
| Approved revision: | no longer in the source branch. |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~twom/canonical-identity-provider/django-1.11 |
| Merge into: | lp://staging/canonical-identity-provider/release |
| Prerequisite: | lp://staging/~twom/canonical-identity-provider/django-1.10 |
| Diff against target: |
378 lines (+58/-38) 11 files modified
Makefile (+1/-1) dependencies.txt (+0/-1) requirements.txt (+2/-1) src/api/v10/handlers.py (+2/-2) src/api/v20/tests/test_login.py (+2/-2) src/identityprovider/auth.py (+4/-4) src/identityprovider/models/api.py (+1/-1) src/identityprovider/tests/test_auth.py (+40/-20) src/identityprovider/tests/test_models_api.py (+3/-3) src/identityprovider/tests/test_models_emailaddress.py (+1/-1) src/identityprovider/tests/test_widgets.py (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~twom/canonical-identity-provider/django-1.11 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adam Collard (community) | Approve | ||
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Update to django 1.11.
Description of the change
Update to django 1.11.
* Ensure that newer psycopg2 is installed
* DateTimeAwareJS
* First argument to authenticate() is always a request, update the Backends and tests to support this
* .default on a field is now cached, so it's harder to mock. Just use `get_default` instead, as that's before the caching.
* Enable vocal deprecation warnings as these are silenced in django 1.11 by default
To post a comment you must log in.
Revision history for this message
| Adam Collard (adam-collard) | # |
Revision history for this message
| Adam Collard (adam-collard) | # |
Revision history for this message
| Tom Wardill (twom) | # |
Revision history for this message
| Adam Collard (adam-collard) | # |
review:
Approve
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM aside from Adam's comments.