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

Fix Django 2 deprecations #227

Merged
merged 5 commits into from
Dec 4, 2017
Merged

Fix Django 2 deprecations #227

merged 5 commits into from
Dec 4, 2017

Conversation

albertyw
Copy link
Member

Fix some deprecations to make silk compatible with django 2.0

@albertyw albertyw changed the title Django2 deprecations Fix Django 2 deprecations Nov 26, 2017
@albertyw albertyw force-pushed the django2-deprecations branch 3 times, most recently from bc19b74 to b90a68e Compare November 26, 2017 20:08
@avelis
Copy link
Collaborator

avelis commented Nov 27, 2017

@albertyw I appreciate the work future proofing silk for Django 2. TravisCI is highlighting an error.

    middleware_installed = 'silk.middleware.SilkyMiddleware' in getattr(settings, 'MIDDLEWARE', [])
TypeError: argument of type 'NoneType' is not iterable

Is it possible for you to look into that so I can merge this in?

@albertyw albertyw force-pushed the django2-deprecations branch from b90a68e to 268e256 Compare November 30, 2017 08:38
@albertyw albertyw force-pushed the django2-deprecations branch from 268e256 to 040cea2 Compare November 30, 2017 08:39
@albertyw albertyw force-pushed the django2-deprecations branch from 040cea2 to f741446 Compare November 30, 2017 09:06
@albertyw albertyw requested review from mtford90 and avelis December 2, 2017 21:49
@jkeyes jkeyes mentioned this pull request Dec 3, 2017
@avelis avelis merged commit 48a2a6c into master Dec 4, 2017
@avelis
Copy link
Collaborator

avelis commented Dec 4, 2017

@albertyw Thanks for addressing Django 2 deprecations!

@albertyw
Copy link
Member Author

albertyw commented Dec 4, 2017

Next time, can we not squash commits? With pypi behind with releases, some people (at least me) are pinning to github hashes and if you squash commits, it means those exact commits don't get merged into master.

@avelis
Copy link
Collaborator

avelis commented Dec 5, 2017

@albertyw Yes I can do that.

danielbradburn pushed a commit to crunchr/silk that referenced this pull request Dec 8, 2017
* Make sure all OneToOneFields explicitly declare on_delete

* Switch to django.urls for imports

* Update test project for django 2

* Default to newer MIDDLEWARE setting

* Declare required app_name variable for inclusion
@albertyw albertyw deleted the django2-deprecations branch December 23, 2017 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants