Merge pull request #62 from asottile/three_two

Three two

Fix #37

Author: dahlia

docs/changes.rst

@@ -6,6 +6,20 @@ Version 0.8.0
 
 To be released.
 
+- Follow up the libsass upstream: 3.2.0 --- See the `release note`__
+  of Libsass.
+  [:issue:`61`, :issue:`52`, :issue:`56`, :issue:`58`, :issue:`62`
+  by Anthony Sottile]
+
+  - Compact and expanded output styles  [:issue:`37`]
+  - Strings and interpolation closer to Ruby Sass
+  - The correctness of the generated sourcemap files
+  - Directive buddling
+  - Full support for the ``@at-root`` directive
+  - Full support for ``!global`` variable scoping
+
+__ https://github.com/sass/libsass/releases/tag/3.2.0
+
 
 Version 0.7.0
 -------------

libsass

@@ -57,7 +57,7 @@ def normalize_path(path):
     'sources': ['test/a.scss'],
     'sourcesContent': [],
     'names': [],
-    'mappings': ';AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,KAAK,EAAE,IAAK,GADX',
+    'mappings': ';AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,KAAK,EAAE,IAAK,GADX',
 }
 
 B_EXPECTED_CSS = '''\
@@ -457,7 +457,7 @@ def test_build_one(self):
                     'sources': ['../test/b.scss'],
                     'sourcesContent': [],
                     'names': [],
-                    'mappings': ';AACG,CAAC,CAAC,CAAC,CAAF;EACA,SAAS,EAAE,IAAI,GADd',
+                    'mappings': ';AACE,CAAC,CAAC,CAAC,CAAD;EACA,SAAS,EAAE,IAAK,GADf',
                 },
                 os.path.join(d, 'css', 'b.scss.css.map')
             )
@@ -475,7 +475,7 @@ def test_build_one(self):
                     'sources': ['../test/d.scss'],
                     'sourcesContent': [],
                     'names': [],
-                    'mappings': ';;AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,IAAI,EAAE,0BAA2B,GADhC',
+                    'mappings': ';;AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,IAAI,EAAE,0BAA2B,GADhC',
                 },
                 os.path.join(d, 'css', 'd.scss.css.map')
             )
@@ -1017,11 +1017,11 @@ def test_raises(self):
                 r'.+'
                 r'AssertionError: foo\n\n'
                 r'       Backtrace:\n'
-                r'       \tstdin:0, in function `raises`\n'
-                r'       \tstdin:0\n'
+                r'       \tstdin:1, in function `raises`\n'
+                r'       \tstdin:1\n'
                 r'        on line 1 of stdin\n'
                 r'>> a { content: raises\(\); }\n'
-                r'   --------------------\^\n$'
+                r'   -------------\^\n$'
         )):
             compile_with_func('a { content: raises(); }')
 
@@ -1030,23 +1030,23 @@ def test_warning(self):
                 'Error: warning in C function returns_warning: '
                 'This is a warning\n'
                 '       Backtrace:\n'
-                '       \tstdin:0, in function `returns_warning`\n'
-                '       \tstdin:0\n'
+                '       \tstdin:1, in function `returns_warning`\n'
+                '       \tstdin:1\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_warning(); }\n'
-                '   -----------------------------^\n'
+                '   -------------^\n'
         ):
             compile_with_func('a { content: returns_warning(); }')
 
     def test_error(self):
         with assert_raises_compile_error(
                 'Error: error in C function returns_error: This is an error\n'
                 '       Backtrace:\n'
-                '       \tstdin:0, in function `returns_error`\n'
-                '       \tstdin:0\n'
+                '       \tstdin:1, in function `returns_error`\n'
+                '       \tstdin:1\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_error(); }\n'
-                '   ---------------------------^\n'
+                '   -------------^\n'
         ):
             compile_with_func('a { content: returns_error(); }')
 
@@ -1066,11 +1066,11 @@ def test_returns_unknown_object(self):
                 '       - SassWarning\n'
                 '       - SassError\n\n'
                 '       Backtrace:\n'
-                '       \tstdin:0, in function `returns_unknown`\n'
-                '       \tstdin:0\n'
+                '       \tstdin:1, in function `returns_unknown`\n'
+                '       \tstdin:1\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_unknown(); }\n'
-                '   -----------------------------^\n'
+                '   -------------^\n'
         ):
             compile_with_func('a { content: returns_unknown(); }')