Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

18 changes: 18 additions & 0 deletions circleci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
dependencies:
pre:
- npm install -g coffee-script
- npm install -g less@1.7.4
- npm install -g babel@4.3.0
- npm install -g stylus@0.50.0
- gem install sass --version 3.3.14
- gem install compass --version 1.0.1
- pip install tox
- pip install coveralls
- pip install flake8

test:
override:
- flake8
- tox
post:
- coveralls
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ def read(fname):
"pytest",
"pytest-django",
"pretend",
"coverage==3.7.1"
],
cmdclass={
"test": PyTest
Expand Down
5 changes: 2 additions & 3 deletions static_precompiler/tests/test_templatetags.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import django.template
import django.template.loader
import pretend


def test_compile_filter(monkeypatch):

compile_static = pretend.call_recorder(lambda source_path: "compiled")
monkeypatch.setattr("static_precompiler.utils.compile_static", compile_static)
template = django.template.loader.get_template_from_string("""{% load compile_static %}{{ "source"|compile }}""")
template = django.template.Template("""{% load compile_static %}{{ "source"|compile }}""")
assert template.render(django.template.Context({})) == "compiled"

monkeypatch.setattr("static_precompiler.settings.PREPEND_STATIC_URL", True)
Expand All @@ -22,7 +21,7 @@ def test_inlinecompile_tag(monkeypatch):

monkeypatch.setattr("static_precompiler.utils.get_compiler_by_name", get_compiler_by_name)

template = django.template.loader.get_template_from_string(
template = django.template.Template(
"{% load compile_static %}{% inlinecompile compiler='sass' %}source{% endinlinecompile %}"
)
assert template.render(django.template.Context({})) == "compiled"
Expand Down
22 changes: 12 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
[tox]
envlist =
flakes
py26-dj{1.6}
py{27,33,34}-dj{1.6,1.7}
py26-django16,
py27-django16,
py27-django17,
py27-django18,
py34-django18

[testenv]
deps =
pytest
pytest-django
pretend
watchdog
dj1.6: Django==1.6.6
dj1.7: Django==1.7
coverage==3.7.1
pytest-cov==2.1.0
django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
commands = py.test
setenv =
PYTHONPATH = {toxinidir}

[testenv:flakes]
deps =
flakes
commands =
flake8
[testenv:py27-django18]
commands = py.test --cov static_precompiler