Skip to content

Follow up libsass upstream 3.0.2 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 16, 2014
Merged

Follow up libsass upstream 3.0.2 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c45d92b
Follow up libsass upstream 3.0.2
RoPP Nov 12, 2014
7adc3f6
Add sourcesContent to _EXPECTED_MAP.
RoPP Nov 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions docs/changes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
Changelog
=========

Version 0.6.2
-------------

To be released.

- Follow up the libsass upstream: :upcommit:`3.0.2` ---
See the `release note`__ of libsass.

__ https://github.com/sass/libsass/releases/tag/3.0.2


Version 0.6.1
-------------

Expand Down
2 changes: 1 addition & 1 deletion libsass
Open in desktop
Submodule libsass updated 52 files
+31 −29 .travis.yml
+55 −26 Makefile
+17 −6 Makefile.am
+216 −66 ast.hpp
+2 −0 ast_factory.hpp
+4 −0 ast_fwd_decl.hpp
+32 −0 b64/cencode.h
+77 −0 b64/encode.h
+15 −0 bind.cpp
+109 −0 cencode.c
+0 −3 configure.ac
+1 −0 constants.cpp
+1 −0 constants.hpp
+35 −25 context.cpp
+20 −4 context.hpp
+57 −10 eval.cpp
+3 −0 eval.hpp
+11 −0 expand.cpp
+1 −0 expand.hpp
+507 −505 extend.cpp
+2 −1 extend.hpp
+20 −0 functions.cpp
+2 −0 functions.hpp
+45 −0 inspect.cpp
+4 −0 inspect.hpp
+1,411 −0 json.cpp
+117 −0 json.hpp
+8 −0 operation.hpp
+81 −5 output_nested.cpp
+1 −0 output_nested.hpp
+104 −41 parser.cpp
+7 −0 parser.hpp
+6 −11 prelexer.cpp
+1 −2 prelexer.hpp
+2 −2 remove_placeholders.cpp
+8 −6 sass.cpp
+3 −1 sass.h
+3 −0 sass2scss.cpp
+12 −10 sass_interface.cpp
+4 −0 sass_interface.h
+33 −33 sass_util.hpp
+72 −0 script/ci-build-libsass
+3 −0 script/ci-install-compiler
+12 −0 script/ci-install-deps
+25 −0 script/ci-report-coverage
+0 −50 script/cibuild
+0 −17 script/install-compiler
+57 −44 source_map.cpp
+2 −3 source_map.hpp
+1 −1 utf8_string.cpp
+55 −12 util.cpp
+3 −2 util.hpp
2 changes: 1 addition & 1 deletion sass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

__all__ = ('MODES', 'OUTPUT_STYLES', 'SOURCE_COMMENTS', 'CompileError',
'and_join', 'compile')
__version__ = '0.6.1'
__version__ = '0.6.2'


#: (:class:`collections.Mapping`) The dictionary of output styles.
Expand Down
4 changes: 3 additions & 1 deletion sasstests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def normalize_path(path):
'version': 3,
'file': 'test/a.css',
'sources': [normalize_source_map_path('test/a.scss')],
'sourcesContent': [],
'names': [],
'mappings': ';AAKA;EAHE,kBAAkB;;EAIpB,KAAK;IAED,OAAO'
}
Expand Down Expand Up @@ -147,7 +148,6 @@ class CompileTestCase(unittest.TestCase):
def test_compile_required_arguments(self):
self.assertRaises(TypeError, sass.compile)


def test_compile_takes_only_keywords(self):
self.assertRaises(TypeError, sass.compile, 'a { color: blue; }')

Expand Down Expand Up @@ -406,6 +406,7 @@ def test_build_one(self):
'version': 3,
'file': '../test/b.css',
'sources': [normalize_source_map_path('../test/b.scss')],
'sourcesContent': [],
'names': [],
'mappings': ';AAAA,EAAE;EAEE,WAAW'
},
Expand All @@ -423,6 +424,7 @@ def test_build_one(self):
'version': 3,
'file': '../test/d.css',
'sources': [normalize_source_map_path('../test/d.scss')],
'sourcesContent': [],
'names': [],
'mappings': ';AAKA;EAHE,kBAAkB;;EAIpB,KAAK;IAED,MAAM'
},
Expand Down