Merge branch 'release/1.2.3'

conan-io · Apr 10, 2018 · 83419cd · 83419cd
2 parents 4fcc96b + cf7009c
commit 83419cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/conans/__init__.py b/conans/__init__.py
@@ -16,4 +16,4 @@
 SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]
 
 
-__version__ = '1.2.2'
+__version__ = '1.2.3'
diff --git a/conans/client/generators/scons.py b/conans/client/generators/scons.py
@@ -19,7 +19,7 @@ def content(self):
                     '        "SHLINKFLAGS" : {info.sharedlinkflags},\n'
                     '        "LINKFLAGS"   : {info.exelinkflags},\n'
                     '    }},\n'
-                    '    "{dep}_version" : "{info.version}"\n')
+                    '    "{dep}_version" : "{info.version}",\n')
 
         sections = []
         sections.append("conan = {\n")

diff --git a/conans/test/generators/scons_test.py b/conans/test/generators/scons_test.py
@@ -25,6 +25,6 @@ def variables_setup_test(self):
         self.assertIn("        \"CPPDEFINES\"  : [\'MYDEFINE2\', \'MYDEFINE1\'],", scons_lines)
         self.assertIn("        \"CPPDEFINES\"  : [\'MYDEFINE1\'],", scons_lines)
         self.assertIn("        \"CPPDEFINES\"  : [\'MYDEFINE2\'],", scons_lines)
-        self.assertIn('    "conan_version" : "None"', scons_lines)
-        self.assertIn('    "MyPkg_version" : "0.1"', scons_lines)
-        self.assertIn('    "MyPkg2_version" : "3.2.3"', scons_lines)
+        self.assertIn('    "conan_version" : "None",', scons_lines)
+        self.assertIn('    "MyPkg_version" : "0.1",', scons_lines)
+        self.assertIn('    "MyPkg2_version" : "3.2.3",', scons_lines)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@
		SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]


		__version__ = '1.2.2'
		__version__ = '1.2.3'