Merge pull request #247 from Roche/dev

v1.2.5
Roche · Nov 24, 2023 · 170554b · 170554b
2 parents b93fd79 + 3c29211
commit 170554b
Show file tree

Hide file tree

Showing 16 changed files with 1,126 additions and 1,065 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -5,7 +5,7 @@ authors:
   given-names: "Otto"
   orcid: "https://orcid.org/0000-0002-3363-9287"
 title: "Pyreadstat"
-version: 1.2.4
+version: 1.2.5
 doi: 10.5281/zenodo.6612282
 date-released: 2018-09-24
 url: "https://github.com/Roche/pyreadstat"
diff --git a/change_log.md b/change_log.md
@@ -1,3 +1,6 @@
+# 1.2.5 (github, pypi and conda 2023.11.24)
+* Correcting bug for datetime64[us
+
 # 1.2.4 (github, pypi and conda 2023.10.23)
 * Added modification_time and creation_time to metadata
 * added datetime64[us in addition to ns for improvement when writing.

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: 6ff477675a66a2934322b33bfdc0e690
+config: 747f6e874f37f43245053c55564db6af
 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.2.4',
+    VERSION: '1.2.5',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Index &mdash; pyreadstat 1.2.4 documentation</title>
+  <title>Index &mdash; pyreadstat 1.2.5 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>

diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Welcome to pyreadstat’s documentation! &mdash; pyreadstat 1.2.4 documentation</title>
+  <title>Welcome to pyreadstat’s documentation! &mdash; pyreadstat 1.2.5 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>

diff --git a/docs/_build/html/py-modindex.html b/docs/_build/html/py-modindex.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Python Module Index &mdash; pyreadstat 1.2.4 documentation</title>
+  <title>Python Module Index &mdash; pyreadstat 1.2.5 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>

diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Search &mdash; pyreadstat 1.2.4 documentation</title>
+  <title>Search &mdash; pyreadstat 1.2.5 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 

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.2.4'
+release = '1.2.5'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyreadstat/__init__.py b/pyreadstat/__init__.py
@@ -20,5 +20,5 @@
 from .pyreadstat import read_file_in_chunks, read_file_multiprocessing
 from ._readstat_parser import ReadstatError, metadata_container
 
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
diff --git a/pyreadstat/_readstat_parser.c b/pyreadstat/_readstat_parser.c
diff --git a/pyreadstat/_readstat_parser.pyx b/pyreadstat/_readstat_parser.pyx
@@ -608,8 +608,6 @@ cdef int handle_value(int obs_index, readstat_variable_t * variable, readstat_va
     index = readstat_variable_get_index_after_skipping(variable)
     max_n_obs = dc.max_n_obs
     is_unkown_number_rows = dc.is_unkown_number_rows
-    #iscurnptypeobject = dc.col_dtypes_isobject[index]
-    #iscurnptypefloat = dc.col_dytpes_isfloat[index]
 
     # check that we still have enough room in our pre-allocated lists
     # if not, add more room

diff --git a/pyreadstat/_readstat_writer.c b/pyreadstat/_readstat_writer.c
diff --git a/pyreadstat/_readstat_writer.pyx b/pyreadstat/_readstat_writer.pyx
@@ -781,20 +781,21 @@ cdef int run_write(df, object filename_path, dst_file_format file_format, str fi
                     df2.iloc[:, col_indx] = (np.round(df2.iloc[:, col_indx].values.astype(object).astype(np.float64)/1e9) + offset_secs) * mulfac
                 elif pywriter_types[col_indx] == PYWRITER_DATETIME64_US:
                     df2.iloc[:, col_indx] = (np.round(df2.iloc[:, col_indx].values.astype(np.float64)/1e6) + offset_secs) * mulfac
+                    df2.loc[df2[df2.columns[col_indx]]==-9223056417655, df2.columns[col_indx]] = np.nan
+
         else:
             df2 = df
 
         # inserting
         rowcnt = 0
 
-        for  row in df2.values:
+        for row in df2.values:
             check_exit_status(readstat_begin_row(writer))
 
             for col_indx in range(col_count):
 
                 tempvar = readstat_get_variable(writer, col_indx)
                 curval = row[col_indx]
-                #curtype = col_types[col_indx][0]
                 curtype = pywriter_types[col_indx]
                 is_missing = col_types[col_indx][2]
                 curuser_missing = None

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