added committers and bumped version to 0.3.48

chimpler · Nov 15, 2018 · d8670ad · d8670ad
1 parent 3bfe203
commit d8670ad
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+# Version 0.3.48
+
+* Support conversion of numerically-index objects to arrays (a.1 = 4) (@lune-sta) [#189]
+* Handle ConfigValues and ConfigSubstitution in HOCONConverter.to_hocon (@ChristopheDuong) [#192]
+* Fix raising of ConfigException for get_int() and get_float() (@ElkMonster) [#188]
+* Fixed Flake8 error for Python 2.7
+
 # Version 0.3.47
 
 * Fixed negative integer parsing [#185]
@@ -10,7 +17,7 @@
 
 # Version 0.3.45
 
-* Fixed scientific notation parsing (chunyang-wen) [#177]
+* Fixed scientific notation parsing (@chunyang-wen) [#177]
 
 # Version 0.3.44
 

diff --git a/README.md b/README.md
@@ -353,6 +353,9 @@ Java properties mapping                                    | :x:
   - derkcrezee [@derkcrezee](https://github.com/derkcrezee)
   - Roee Nizan [@roee-allegro](https://github.com/roee-allegro)
   - Samuel Bible [@sambible](https://github.com/sambible)
+  - Christophe Duong [@ChristopheDuong](https://github.com/ChristopheDuong)
+  - lune* [@lune-sta](https://github.com/lune-sta)
+  - Sascha [@ElkMonster](https://github.com/ElkMonster)
 
 ### Thanks
 

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def run_tests(self):
 
 setup(
     name='pyhocon',
-    version='0.3.47',
+    version='0.3.48',
     description='HOCON parser for Python',
     long_description='pyhocon is a HOCON parser for Python. Additionally we provide a tool (pyhocon) to convert any HOCON '
                      'content into json, yaml and properties format.',

diff --git a/tests/test_tool.py b/tests/test_tool.py
@@ -183,5 +183,6 @@ def test_substitutions_conversions():
     """
     converted1 = HOCONConverter.to_hocon(ConfigFactory.parse_string(config_string, resolve=False))
     converted2 = HOCONConverter.to_hocon(ConfigFactory.parse_string(converted1, resolve=False))
-    assert [line.strip() for line in converted1.split('\n') if line.strip()] \
-           == [line.strip() for line in converted2.split('\n') if line.strip()]
+    line1_tokens = [line.strip() for line in converted1.split('\n') if line.strip()]
+    line2_tokens = [line.strip() for line in converted2.split('\n') if line.strip()]
+    assert line1_tokens == line2_tokens