Merge pull request #383 from OpenDataServices/ods-bug

Fix another number formatting .ods bug
OpenDataServices · Mar 24, 2021 · 69e906b · 69e906b
2 parents 57af89b + e1f58ec
commit 69e906b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.16.0] - 2021-03-24
+
+### Fixed
+
+- Fix another number formatting .ods bug https://github.com/OpenDataServices/flatten-tool/pull/383
+
+### Changed
+
+- Reduce memory footprint of flattening https://github.com/OpenDataServices/flatten-tool/pull/376
+
 ## [0.15.4] - 2021-03-08
 
 ### Fixed

diff --git a/flattentool/ODSReader.py b/flattentool/ODSReader.py
@@ -84,7 +84,7 @@ def readSheet(self, sheet):
                                     "value",
                                 )
                             )
-                            if "." in str(cell):
+                            if "." in str(value):
                                 arrCells[count] = float(value)
                             else:
                                 arrCells[count] = int(value)

diff --git a/flattentool/tests/test_input_SpreadsheetInput.py b/flattentool/tests/test_input_SpreadsheetInput.py
@@ -196,7 +196,9 @@ def test_xlsx_input_types(self):
                 "colFloat": 1000.2,
                 "colFloatComma": 1000.2,
                 "colDate": datetime.datetime(2020, 3, 5),
-                "colDateTime": datetime.datetime(2020, 2, 7, 16, 41, 0, 1),
+                "colDateTime": datetime.datetime(
+                    2020, 2, 7, 16, 41, 0, 1 if sys.version_info < (3, 6) else 0
+                ),
                 None: None,
             }
         ]

diff --git a/setup.py b/setup.py
@@ -43,7 +43,7 @@ def run(self):
 
 setup(
     name="flattentool",
-    version="0.15.4",
+    version="0.16.0",
     author="Open Data Services",
     author_email="code@opendataservices.coop",
     packages=["flattentool"],