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
Remove unused import patterns, fix project for Django > 1.8 #13
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d1c5513
Remove unused import patterns, fix project for Django > 1.8
tonythomas01 3d7bba3
Update tox configuration to run tests on Django==1.10.4
tonythomas01 9666b4c
Add travis yml file to run tox tests
tonythomas01 5b8d65b
Upgrade urlpatterns to match Django>1.8 format
tonythomas01 ead3335
Fix test failures for Django 1.10
tonythomas01 b10f9da
Upgrade tests to run on Django 1.11.1
tonythomas01 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
sudo: false | ||
language: python | ||
python: | ||
- "3.5" | ||
install: | ||
- pip install tox-travis | ||
script: | ||
- tox |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
"""Setup url to run tests.""" | ||
|
||
from django.conf.urls import patterns, include, url | ||
from django.conf.urls import include, url | ||
|
||
urlpatterns = patterns('', | ||
urlpatterns = [ | ||
url(r'^/', include("django_jasmine.urls")) | ||
) | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
[tox] | ||
envlist = {py27,py34,py35}-django{18,19} | ||
envlist = {py27,py34,py35}-django{18,19,110,111} | ||
|
||
[testenv] | ||
deps = | ||
pytest | ||
pytest-django | ||
django18: Django==1.8.10 | ||
django19: Django==1.9.3 | ||
django110: Django==1.10.4 | ||
django111: Django==1.11.1 | ||
commands = py.test {posargs} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add the latest Django version also: 1.11.1 I believe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I havent personally tried it with Django=1.11.1. Let me get travis run it on 1.10.4, and if that goes green - will add for sure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have a branch that takes care of most it if you want to add 1.11.1 and change the base to develop we can merge it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am trying to fix the issues with 1.10 now. Looks like some
reverse
imports from somewhere else post 1.10.