Skip to content

Commit

Permalink
Try to fix Travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
davidfischer-ch committed Jun 5, 2018
1 parent 6b1d824 commit a820842
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ install:
- travis_retry sudo pip install --user coveralls
script:
# - rm -rf django* rest_framework # Not maintained so not testable ...
- python setup.py test
- sudo python setup.py test
matrix:
allow_failures:
- python: 2.6
Expand Down
7 changes: 5 additions & 2 deletions tests/pytoolbox_runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import os, shutil, tarfile, tempfile

import six
from django.conf import settings

from pytoolbox.exceptions import BadHTTPResponseCodeError
from pytoolbox.network.http import download_ext
Expand All @@ -17,7 +16,11 @@

def main():
print('Configure Django')
settings.configure()
try:
from django.conf import settings
settings.configure()
except ImportError:
print('WARNING: Django not available for testing purposes')

print('Download the test assets')
for url, path in constants.TEST_ASSETS:
Expand Down

0 comments on commit a820842

Please sign in to comment.