solved Roche#183

wangw106 · Apr 29, 2022 · 987745d · 987745d
1 parent 9e6c6ab
commit 987745d
Show file tree

Hide file tree

Showing 7 changed files with 164 additions and 146 deletions.
diff --git a/change_log.md b/change_log.md
@@ -1,4 +1,7 @@
-# 1.1.5 (github, pypi and conda xxxx.xx.xx)
+# 1.1.6 (github, pypi and conda xxxx.xx.xx)
+* Solved #183
+
+# 1.1.5 (github, pypi and conda 2022.04.28)
 * Solved #159, #158, #163, #164, #172, #177
 * Added new date formats for SAS and SPSS solves #170, #171
 * Added check missing\_range type against variable type solves #180

diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
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.5'
+release = '1.1.6'
 
 
 # -- 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.5"
+__version__ = "1.1.6"
diff --git a/pyreadstat/_readstat_writer.c b/pyreadstat/_readstat_writer.c
diff --git a/pyreadstat/_readstat_writer.pyx b/pyreadstat/_readstat_writer.pyx
@@ -223,7 +223,7 @@ cdef list get_pandas_column_types(object df, dict missing_user_values, dict vari
                 result.append((PYWRITER_DATETIME, 0,1))
             else:
                 result.append((PYWRITER_DATETIME, 0,0))
-        elif col_type == object or col_type in int_mixed_types:
+        elif col_type == object or col_type == 'string' or col_type in int_mixed_types:
             is_missing = 0
             if curuser_missing:
                 curseries = curseries[~curseries.isin(curuser_missing)].reset_index(drop=True)
@@ -263,7 +263,6 @@ cdef list get_pandas_column_types(object df, dict missing_user_values, dict vari
                     max_length = get_pandas_str_series_max_length(curseries.astype(str), variable_value_labels.get(col_name))
                     result.append((PYWRITER_OBJECT, max_length, 0))
                     continue
-
             if curtype in int_types:
                 result.append((PYWRITER_INTEGER, 0, is_missing))
             elif curtype in float_types:
@@ -389,7 +388,7 @@ cdef void add_missing_ranges(list cur_ranges, readstat_variable_t *variable, pyw
                     check_exit_status(readstat_variable_add_missing_double_range(variable, lo, hi))
                     range_values += 1
             elif type(hi) == str and type(lo) == str:
-                if vartype != PYWRITER_CHARACTER:
+                if vartype != PYWRITER_CHARACTER and vartype != PYWRITER_OBJECT:
                     msg = "character missing_ranges value given for non character variable %s" %variablename
                     raise PyreadstatError(msg)
                 if hi == lo:
@@ -413,7 +412,7 @@ cdef void add_missing_ranges(list cur_ranges, readstat_variable_t *variable, pyw
                 check_exit_status(readstat_variable_add_missing_double_value(variable, cur_range))
                 discrete_values += 1
             elif type(cur_range) == str:
-                if vartype != PYWRITER_CHARACTER:
+                if vartype != PYWRITER_CHARACTER and vartype != PYWRITER_OBJECT:
                     msg = "character missing_ranges value given for non character variable %s" %variablename
                     raise PyreadstatError(msg)
                 if len(cur_range) > 8:

diff --git a/setup.py b/setup.py
@@ -117,7 +117,7 @@
 
 setup(
     name='pyreadstat',
-    version='1.1.5',
+    version='1.1.6',
     description=short_description,
     author="Otto Fajardo",
     author_email="pleasecontactviagithub@notvalid.com",