Merge pull request #11 from IntuitionEngineeringTeam/beta

Bug_fix

Author: ArnoldMSU

rbp_setup_tools/code_generation.py

@@ -1,6 +1,6 @@
 #
 #  Created by Soldoskikh Kirill.
-#  Copyright © 2018 Intuition. All rights reserved.
+#  Copyright 2018 Intuition. All rights reserved.
 #
 
 # Generates templated source code for multiple types.

rbp_setup_tools/types.py

@@ -1,6 +1,6 @@
 #
 #  Created by Soldoskikh Kirill.
-#  Copyright © 2018 Intuition. All rights reserved.
+#  Copyright 2018 Intuition. All rights reserved.
 #
 
 TYPES = [ 'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t','uint96_t', 'uint128_t',

redblackpy/cython_source/__dtype_tree_processing.pxi

@@ -40,7 +40,7 @@ cdef void __erase_node_{DTYPE}(rb_tree_ptr& index, key) except*:
         index.erase(node)
 
 
-cdef inline void __set_value_{DTYPE}(node_ptr node, {DTYPE} value) nogil:
+cdef inline void __set_value_{DTYPE}(node_ptr node, {DTYPE} value) nogil except*:
 
     if deref(node).value != NULL:
         (<{DTYPE}*>deref(node).value)[0] = value
@@ -50,7 +50,7 @@ cdef inline void __set_value_{DTYPE}(node_ptr node, {DTYPE} value) nogil:
         (<{DTYPE}*>deref(node).value)[0] = value
 
 
-cdef inline void __dealloc_value_{DTYPE}(node_ptr node) nogil:
+cdef inline void __dealloc_value_{DTYPE}(node_ptr node) nogil except*:
 
     if deref(node).value != NULL:
         free(deref(node).value)

redblackpy/cython_source/object_tree_processing.pxi

@@ -7,20 +7,20 @@ cdef inline object __deref_value_ptr_object(node_ptr node):
     return <object>deref(node).value
 
 
-cdef inline void __insert_node_object(rb_tree_ptr& index, key, value):
+cdef inline void __insert_node_object(rb_tree_ptr& index, key, value) except*:
 
     index.insert( rb_node_valued( to_c_pyobject(key), 
                                   to_c_pyobject(value).data ) )
 
 
 cdef inline void __insert_node_by_ptr_object( rb_tree_ptr& index, node_ptr& position, 
-                                              key, value ):
+                                              key, value ) except*:
 
     index.insert( position, rb_node_valued( to_c_pyobject(key), 
                                             to_c_pyobject(value).data ) )
 
 
-cdef void __erase_node_object(rb_tree_ptr& index, key):
+cdef void __erase_node_object(rb_tree_ptr& index, key) except*:
 
     cdef c_pyobject c_key = c_pyobject(<PyObject*>key) 
     cdef node_ptr node = index.search(c_key)
@@ -33,12 +33,12 @@ cdef void __erase_node_object(rb_tree_ptr& index, key):
         index.erase(node)
 
 
-cdef void __set_value_object(node_ptr node, value):
+cdef void __set_value_object(node_ptr node, value) except*:
 
     Py_XDECREF(<PyObject*>deref(node).value)
     deref(node).value = to_c_pyobject(value).data
 
 
-cdef inline void __dealloc_value_object(node_ptr node):
+cdef inline void __dealloc_value_object(node_ptr node) except*:
 
     Py_XDECREF(<PyObject*>deref(node).value)

redblackpy/series/tree_series.pyx

@@ -808,7 +808,9 @@ cdef class Series:
         """
         Initialize Series object from pandas.Series.
         """
-        cdef Series result = Series( dtype=str(pd_series.dtype), 
+        cdef Series result = Series( index=pd_series.index,
+                                     values=pd_series.data,
+                                     dtype=str(pd_series.dtype), 
                                      interpolate=interpolate,
                                      extrapolate=extrapolate,
                                      arithmetic=arithmetic )

setup.py

@@ -1,6 +1,6 @@
 #
 #  Created by Soldoskikh Kirill.
-#  Copyright © 2018 Intuition. All rights reserved.
+#  Copyright 2018 Intuition. All rights reserved.
 #
 
 import os
@@ -16,7 +16,7 @@
 if platform.system() == 'Darwin':
 
     compile_opts = [ '-std=c++11', 
-                     '-mmacosx-version-min=10.9',  
+                     '-mmacosx-version-min=10.7',  
                      '-stdlib=libc++', 
                      '-Ofast' ]
 
@@ -98,9 +98,9 @@
 
 setup( name='redblackpy',
        ext_modules = cythonize(ext_modules),
-       version='0.1.0.0',
+       version='0.1.1.0',
        author='Solodskikh Kirill',
-       author_email='solodskihkirill@gmail.com',
+       author_email='hypo@intuition.engineering',
        maintainer='Intuition',
        maintainer_email='dev@intuition.engineering',
        install_requires=['cython>=0.27', 'pandas'],
@@ -114,8 +114,10 @@
        license='Apache License 2.0', 
        long_description='RedBlackPy is a light Python library that provides data structures \
        aimed to fast insertion, removal and self sorting to manipulating ordered data in efficient way.\
-      The core part of the library had been written on C++ and then was wrapped in Cython. \
-      Hope that many would find the primary data structures of this library very handy in working \
-      with time series. One of the main feature of this structures is an access by arbitrary \
-      key using interpolation, what makes processing of multiple non synchronized time series very simple.\
-      All data structures based on red black trees.' )
+       The core part of the library had been written on C++ and then was wrapped in Cython. \
+       Hope that many would find the primary data structures of this library very handy in working \
+       with time series. One of the main feature of this structures is an access by arbitrary \
+       key using interpolation, what makes processing of multiple non synchronized time series very simple.\
+       All data structures based on red black trees.',
+       classifiers = [ 'Programming Language :: Python :: 2.7',
+                       'Programming Language :: Python :: 3' ] )