Skip to content

Commit

Permalink
Merge pull request #249 from Roche/dev
Browse files Browse the repository at this point in the history
v1.2.6
  • Loading branch information
ofajardo committed Dec 20, 2023
2 parents 170554b + 19f0293 commit b19d86e
Show file tree
Hide file tree
Showing 14 changed files with 1,302 additions and 1,280 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors:
given-names: "Otto"
orcid: "https://orcid.org/0000-0002-3363-9287"
title: "Pyreadstat"
version: 1.2.5
version: 1.2.6
doi: 10.5281/zenodo.6612282
date-released: 2018-09-24
url: "https://github.com/Roche/pyreadstat"
3 changes: 3 additions & 0 deletions change_log.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 1.2.5 (github, pypi and conda 2023.12.20)
* correcting bug when writing files with character columns with all missing, character length set to 1

# 1.2.5 (github, pypi and conda 2023.11.24)
* Correcting bug for datetime64[us

Expand Down
Binary file modified docs/_build/doctrees/environment.pickle
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/_build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -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: 747f6e874f37f43245053c55564db6af
config: c753dad9ecdd8cb110ace3bf962d3d4d
tags: 645f666f9bcd5a90fca523b33c5a78b7
2 changes: 1 addition & 1 deletion docs/_build/html/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.2.5',
VERSION: '1.2.6',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 documentation</title>
<title>Index &mdash; pyreadstat 1.2.6 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]>
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 documentation</title>
<title>Welcome to pyreadstat’s documentation! &mdash; pyreadstat 1.2.6 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]>
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/py-modindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 documentation</title>
<title>Python Module Index &mdash; pyreadstat 1.2.6 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]>
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 documentation</title>
<title>Search &mdash; pyreadstat 1.2.6 documentation</title>
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# The short X.Y version
version = ''
# The full version, including alpha/beta/rc tags
release = '1.2.5'
release = '1.2.6'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pyreadstat/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
from .pyreadstat import read_file_in_chunks, read_file_multiprocessing
from ._readstat_parser import ReadstatError, metadata_container

__version__ = "1.2.5"
__version__ = "1.2.6"

2,556 changes: 1,287 additions & 1,269 deletions pyreadstat/_readstat_writer.c

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pyreadstat/_readstat_writer.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ cdef int get_pandas_str_series_max_length(object series, dict value_labels):
values = series.values
cdef str val
cdef bytes temp
cdef int max_length = 0
cdef int max_length = 1
cdef int curlen
cdef list labels
for val in values:
Expand Down Expand Up @@ -278,6 +278,7 @@ cdef list get_pandas_column_types(object df, dict missing_user_values, dict vari
if is_missing:
col = curseries.dropna().reset_index(drop=True)
max_length = get_pandas_str_series_max_length(col, variable_value_labels.get(col_name))
max_length = max(1, max_length)
else:
max_length = get_pandas_str_series_max_length(curseries, variable_value_labels.get(col_name))
result.append((PYWRITER_CHARACTER, max_length, is_missing))
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

setup(
name='pyreadstat',
version='1.2.5',
version='1.2.6',
description=short_description,
author="Otto Fajardo",
author_email="pleasecontactviagithub@notvalid.com",
Expand Down

0 comments on commit b19d86e

Please sign in to comment.