Merge pull request #34 from sir-sigurd/django-1.7

django 1.7 tests

Author: Andrey Fedoseev

.travis.yml

@@ -3,15 +3,24 @@ python:
  - "3.3"
  - "2.7"
  - "2.6"
-env: DJANGO_SETTINGS_MODULE="static_precompiler.tests.django_settings"
+env:
+ global:
+ - DJANGO_SETTINGS_MODULE="static_precompiler.tests.django_settings"
+ matrix:
+ - DJANGO_VERSION=1.6.6
+ - DJANGO_VERSION=1.7
+matrix:
+ exclude:
+ - python: "2.6"
+ env: DJANGO_VERSION=1.7
 before_install:
  - npm install -g coffee-script
- - npm install -g less
+ - npm install -g less@1.7.4
  - gem install sass --version 3.3.14
  - gem install compass --version 1.0.1
 install:
  - pip install coveralls
- - pip install django
+ - pip install django==$DJANGO_VERSION
  - pip install six
  - pip install mock
  - pip install watchdog

static_precompiler/tests/__init__.py

@@ -11,6 +11,13 @@ def suite():
  from static_precompiler.tests import test_templatetags
  from static_precompiler.tests import test_management
 
+ try:
+ # django 1.7+
+ from django import setup
+ setup()
+ except ImportError:
+ pass
+
  test_suite = unittest.TestSuite()
  test_suite.addTests(test_base_compiler.suite())
  test_suite.addTests(test_url_converter.suite())