From 5a3b69ba4bb839065e126ca59c2195a0fc23761b Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Fri, 28 Aug 2015 11:31:16 -0400
Subject: [PATCH] Add current directory to the sass compilation path.
This is the default in 3.2, but will need to be explicitly stated in
Sass 3.4.
Also, added a --force parameter to compile_sass to make it easier to see
what warnings are current.
---
pavelib/assets.py | 8 +++++++-
pavelib/paver_tests/test_servers.py | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pavelib/assets.py b/pavelib/assets.py
index c159986c35f..be50c9eee02 100644
--- a/pavelib/assets.py
+++ b/pavelib/assets.py
@@ -132,7 +132,10 @@ def compile_coffeescript(*files):
@task
@no_help
-@cmdopts([('debug', 'd', 'Debug mode')])
+@cmdopts([
+ ('debug', 'd', 'Debug mode'),
+ ('force', '', 'Force full compilation'),
+])
def compile_sass(options):
"""
Compile Sass to CSS.
@@ -146,6 +149,9 @@ def compile_sass(options):
parts.append("--sourcemap")
else:
parts.append("--style compressed --quiet")
+ if options.get('force'):
+ parts.append("--force")
+ parts.append("--load-path .")
for load_path in SASS_LOAD_PATHS + SASS_DIRS.keys():
parts.append("--load-path {path}".format(path=load_path))
diff --git a/pavelib/paver_tests/test_servers.py b/pavelib/paver_tests/test_servers.py
index 6c3267dd232..f5a10579754 100644
--- a/pavelib/paver_tests/test_servers.py
+++ b/pavelib/paver_tests/test_servers.py
@@ -12,7 +12,7 @@ EXPECTED_COFFEE_COMMAND = (
)
EXPECTED_SASS_COMMAND = (
"sass --update --cache-location /tmp/sass-cache --default-encoding utf-8 --style compressed"
- " --quiet --load-path common/static --load-path common/static/sass"
+ " --quiet --load-path . --load-path common/static --load-path common/static/sass"
" --load-path lms/static/sass --load-path lms/static/certificates/sass"
" --load-path cms/static/sass --load-path common/static/sass"
" lms/static/sass:lms/static/css lms/static/certificates/sass:lms/static/certificates/css"
--
GitLab