Merge pull request #147 from Roche/dev

version 1.1.3
Roche · Oct 4, 2021 · e0627c7 · e0627c7
2 parents f65f3d4 + ece557b
commit e0627c7
Show file tree

Hide file tree

Showing 23 changed files with 545 additions and 501 deletions.
diff --git a/README.md b/README.md
@@ -863,4 +863,4 @@ pull request to ReadStat first.
 
 [alchemyst](https://github.com/alchemyst): improvements to docstrings
 
-[bmwiedemann](https://github.com/bmwiedemann), [toddrme2178 ](https://github.com/toddrme2178): improvements to source code
+[bmwiedemann](https://github.com/bmwiedemann), [toddrme2178 ](https://github.com/toddrme2178), [Martin Thorsen Ranang](https://github.com/mtr): improvements to source code
diff --git a/change_log.md b/change_log.md
@@ -1,3 +1,8 @@
+# 1.1.3 (github, pypi and conda 2021.10.05)
+# Updated Readstat source to version 1.1.17
+* Improved error when reading dates and finding a string (#145)
+* repaired not reading correctly metadata with multiprocessing (#146)
+
 # 1.1.2 (github, pypi and conda 2021.05.05)
 # correction when reading file paths in python <3.7
 

diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: dd3822121a8fbe44de4d47508f00568c
+config: a28684826cc54cacb45bacf5376334e5
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_build/html/_static/documentation_options.js b/docs/_build/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '1.1.2',
+    VERSION: '1.1.3',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Index &mdash; pyreadstat 1.1.2 documentation</title>
+  <title>Index &mdash; pyreadstat 1.1.3 documentation</title>
 
 
 

diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Welcome to pyreadstat’s documentation! &mdash; pyreadstat 1.1.2 documentation</title>
+  <title>Welcome to pyreadstat’s documentation! &mdash; pyreadstat 1.1.3 documentation</title>
 
 
 

diff --git a/docs/_build/html/py-modindex.html b/docs/_build/html/py-modindex.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Python Module Index &mdash; pyreadstat 1.1.2 documentation</title>
+  <title>Python Module Index &mdash; pyreadstat 1.1.3 documentation</title>
 
 
 

diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Search &mdash; pyreadstat 1.1.2 documentation</title>
+  <title>Search &mdash; pyreadstat 1.1.3 documentation</title>
 
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '1.1.2'
+release = '1.1.3'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyreadstat/__init__.py b/pyreadstat/__init__.py
@@ -20,4 +20,4 @@
 from .pyreadstat import read_file_in_chunks, read_file_multiprocessing
 from ._readstat_parser import ReadstatError, metadata_container
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"
diff --git a/pyreadstat/_readstat_parser.c b/pyreadstat/_readstat_parser.c
diff --git a/pyreadstat/_readstat_parser.pyx b/pyreadstat/_readstat_parser.pyx
@@ -317,7 +317,7 @@ cdef object convert_readstat_to_python_value(readstat_value_t value, int index,
             result = py_str_value
         else:
             #str_byte_val = py_str_value.encode("UTF-8")
-            raise PyreadstatError("STRING type with value %s with date type" % py_str_value )
+            raise PyreadstatError("STRING type with value '%s' with date type in column '%s'" % (py_str_value, dc.col_names[index]))
     elif pyformat == VAR_FORMAT_LONG:
         if var_format == DATE_FORMAT_NOTADATE or dc.no_datetime_conversion:
             result = py_long_value
Original file line number	Diff line number	Diff line change
Expand Up		@@ -863,4 +863,4 @@ pull request to ReadStat first.

		[alchemyst](https://github.com/alchemyst): improvements to docstrings

		[bmwiedemann](https://github.com/bmwiedemann), [toddrme2178 ](https://github.com/toddrme2178): improvements to source code
		[bmwiedemann](https://github.com/bmwiedemann), [toddrme2178 ](https://github.com/toddrme2178), [Martin Thorsen Ranang](https://github.com/mtr): improvements to source code
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,7 +7,7 @@

		<meta name="viewport" content="width=device-width, initial-scale=1.0">

		<title>Index — pyreadstat 1.1.2 documentation</title>
		<title>Index — pyreadstat 1.1.3 documentation</title>



Expand Down