Merge pull request #83 from ofajardo/dev_045

version 0.4.5
ofajardo · Jun 23, 2022 · d93f6fc · d93f6fc
2 parents 5a7ca48 + a5e5213
commit d93f6fc
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 23 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,3 +1,6 @@
+image:
+  - Visual Studio 2019
+
 environment:
 
   matrix:
@@ -7,16 +10,8 @@ environment:
     # The list here is complete (excluding Python 2.6, which
     # isn't covered by this document) at the time of writing.
 
-    - PYTHON_VERSION: "3.7"
-    #- PYTHON: C:\Python37-x64
-    #- PYTHON: C:\Python37
-    #- PYTHON: C:\Python38-x64
-    #- PYTHON: C:\Python38
-    #- PYTHON: C:\Python36-x64
-    #- PYTHON: C:\Python36
-    #- PYTHON: C:\Python35-x64
-    #- PYTHON: C:\Python35
-    #- PYTHON: C:\Python27-x64
+    - PYTHON: C:\Python38
+    - PYTHON_VERSION: "3.8"
 
 platform:
   - x64
@@ -27,7 +22,7 @@ install:
   #- "%PYTHON%\\python.exe -m pip install wheel"
   - cmd: echo "Using cmd"
 
-  - set CONDAPATH=C:\Miniconda37
+  - set CONDAPATH=C:\Miniconda38
   - if "%PLATFORM%" == "x64" set CONDAPATH=%CONDAPATH%-x64
   - call %CONDAPATH%\Scripts\activate
   # prepare environment with conda
@@ -40,7 +35,9 @@ install:
   - python --version
   - python -c "import struct; print(struct.calcsize('P') * 8)"
   # install necessary packages
-  - conda install -q setuptools pip libpython cython wheel
+  #- conda install -q setuptools pip libpython cython wheel
+  - pip install cython
+  - conda install -c conda-forge libpython
   # mingw64 toolchain to compile python extensions
   - conda install -q -c msys2 m2w64-toolchain
 

diff --git a/change_log.md b/change_log.md
@@ -1,3 +1,7 @@
+# 0.4.5 (github, pypi and conda: 2022.06.2X)
+* fixed numpy.float deprecation
+* fixed truncation of files when writing on windows
+
 # 0.4.4 (github, pypi and conda: 2021.12.02)
 * Introducing new pandas data types Float64Dtype and Float32Dtype when writing.
   This requires pandas > 1.2.0. Python 3.6 taken out of wheels as there

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: ee2514f71394247031b13cf188824279
+config: a853ad206b276686e0112a5c0a7bdcc1
 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: '0.4.4',
+    VERSION: '0.4.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; pyreadr 0.4.4 documentation</title>
+  <title>Index &mdash; pyreadr 0.4.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 pyreadr’s documentation! &mdash; pyreadr 0.4.4 documentation</title>
+  <title>Welcome to pyreadr’s documentation! &mdash; pyreadr 0.4.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; pyreadr 0.4.4 documentation</title>
+  <title>Python Module Index &mdash; pyreadr 0.4.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; pyreadr 0.4.4 documentation</title>
+  <title>Search &mdash; pyreadr 0.4.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 = '0.4.4'
+release = '0.4.5'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyreadr/__init__.py b/pyreadr/__init__.py
@@ -1,5 +1,5 @@
 from .pyreadr import read_r, list_objects, write_rds, write_rdata, download_file
 from .custom_errors import PyreadrError, LibrdataError
 
-__version__ = "0.4.4"
+__version__ = "0.4.5"
 
diff --git a/pyreadr/_pyreadr_writer.py b/pyreadr/_pyreadr_writer.py
@@ -21,7 +21,7 @@
              np.int32, np.int16, np.int8, np.uint8, np.uint16}
 int_mixed_types = {pd.Int8Dtype(), pd.Int16Dtype(), pd.Int32Dtype(), pd.UInt8Dtype(), pd.UInt16Dtype()}
 float_types = {np.dtype('int64'), np.dtype('uint64'), np.dtype('uint32'), np.dtype('float'),
-               np.int64, np.uint64, np.uint32, np.float, pd.Int64Dtype(), pd.UInt32Dtype(), pd.UInt64Dtype(),
+               np.int64, np.uint64, np.uint32, float, pd.Int64Dtype(), pd.UInt32Dtype(), pd.UInt64Dtype(),
                pd.Float64Dtype(), pd.Float32Dtype()}
 datetime_types = {datetime.datetime, np.datetime64}
 

diff --git a/pyreadr/librdata.pxd b/pyreadr/librdata.pxd
@@ -143,6 +143,7 @@ IF UNAME_SYSNAME == 'Windows':
         cdef int _O_BINARY
         cdef int _O_CREAT
         cdef int _O_WRONLY
+        cdef int _O_TRUNC
 
     cdef extern from '<io.h>':
         cdef int _close(int fd)

diff --git a/pyreadr/librdata.pyx b/pyreadr/librdata.pyx
@@ -28,7 +28,7 @@ cdef int _os_open(path, mode):
             u16_path = PyUnicode_AsWideCharString(path, &length)
             return _wsopen(u16_path, flags, _SH_DENYWR, _S_IREAD | _S_IWRITE)
         else:
-            flags = _O_WRONLY | _O_CREAT | _O_BINARY
+            flags = _O_WRONLY | _O_CREAT | _O_BINARY | _O_TRUNC
             u16_path = PyUnicode_AsWideCharString(os.fsdecode(path), &length)
             return _wsopen(u16_path, flags, _SH_DENYRW, _S_IREAD | _S_IWRITE)
     ELSE:

diff --git a/setup.py b/setup.py
@@ -83,7 +83,7 @@
 
 setup(
     name='pyreadr',
-    version='0.4.4',
+    version='0.4.5',
     ext_modules=cythonize([librdata], force=True),
     packages=["pyreadr"],
     include_package_data=True,