Merge pull request #68 from Roche/dev

version 1.0.1
Roche · Aug 19, 2020 · b8b91fc · b8b91fc
2 parents b615d38 + 95aea7d
commit b8b91fc
Show file tree

Hide file tree

Showing 17 changed files with 93 additions and 150 deletions.
diff --git a/change_log.md b/change_log.md
@@ -1,3 +1,7 @@
+# 1.0.1 (github, pypi and conda 20200819)
+* updated readstat to commit f867d75af24cb5ca355befc8607e3a9ff1898f15, 
+  fixes issue #67
+
 # 1.0.0 (github, pypi and conda 20200616)
 * improved error messages when column names have spaces
 * updated readstat to release 1.1.3: improved support for columns with

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: e9177a682b8916d767786721bbf03f18
+config: 84afa259158564947a5dd3afe89c6b15
 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.0.0',
+    VERSION: '1.0.1',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

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

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

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

diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Search &mdash; pyreadstat 1.0.0 documentation</title>
+  <title>Search &mdash; pyreadstat 1.0.1 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.0.0'
+release = '1.0.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyreadstat/__init__.py b/pyreadstat/__init__.py
@@ -20,4 +20,4 @@
 from .pyreadstat import read_file_in_chunks
 from ._readstat_parser import ReadstatError, metadata_container
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
diff --git a/setup.py b/setup.py
@@ -136,7 +136,7 @@
 
 setup(
     name='pyreadstat',
-    version='1.0.0',
+    version='1.0.1',
     description=short_description,
     author="Otto Fajardo",
     author_email="[email protected]",

diff --git a/src/spss/readstat_por_read.c b/src/spss/readstat_por_read.c
@@ -511,8 +511,8 @@ static readstat_error_t read_variable_label_record(por_ctx_t *ctx) {
         goto cleanup;
     }
 
-    varinfo->label = realloc(varinfo->label, strlen(string) + 1);
-    strcpy(varinfo->label, string);
+    varinfo->label = realloc(varinfo->label, 4*strlen(string) + 1);
+    retval = readstat_convert(varinfo->label, 4*strlen(string) + 1, string, strlen(string), ctx->converter);
 
 cleanup:
     return retval;
@@ -697,7 +697,7 @@ readstat_error_t handle_variables(por_ctx_t *ctx) {
         spss_varinfo_t *info = &ctx->varinfo[i];
         info->index = i;
 
-        ctx->variables[i] = spss_init_variable_for_info(info, index_after_skipping);
+        ctx->variables[i] = spss_init_variable_for_info(info, index_after_skipping, ctx->converter);
 
         snprintf(label_name_buf, sizeof(label_name_buf), POR_LABEL_NAME_PREFIX "%d", info->labels_index);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,7 @@

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

		<title>Index — pyreadstat 1.0.0 documentation</title>
		<title>Index — pyreadstat 1.0.1 documentation</title>



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,7 +8,7 @@

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

		<title>Welcome to pyreadstat’s documentation! — pyreadstat 1.0.0 documentation</title>
		<title>Welcome to pyreadstat’s documentation! — pyreadstat 1.0.1 documentation</title>



Expand Down