Hopiu/django-constance
1
0
Fork 0
mirror of https://github.com/jazzband/django-constance.git synced 2026-03-16 22:40:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #194 from felixxm/issue-django2.0-include-compatibility

Browse source 
Fixed Django 2.0 tests due to `django.conf.urls.include` behavior change. Removed pypy for Django 2.0 tests.
This commit is contained in:
Camilo Nova 2017-01-31 08:37:30 -05:00 committed by GitHub
commit d008017fd0
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -20,14 +20,12 @@ env:
- TOXENV=pypy-django-19
- TOXENV=pypy-django-110
- TOXENV=pypy-django-111
- TOXENV=pypy-django-master
matrix:
allow_failures:
- env: TOXENV=py27-django-111
- env: TOXENV=py35-django-111
- env: TOXENV=pypy-django-111
- env: TOXENV=py35-django-master
- env: TOXENV=pypy-django-master
script:
- tox
deploy:

2
tests/urls.py
View file

@ -4,5 +4,5 @@ from django.conf.urls import url, include
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^admin/', admin.site.urls),
]

2
tox.ini
View file

@ -1,7 +1,7 @@
[tox]
envlist =
{py27,py35,pypy}-django-{18,19,110,111}
{py35,pypy}-django-master
{py35}-django-master
[testenv]
basepython =