Merge pull request #25 from 3ptscience/fix/minorBugs

bug fixes for v0.1.5

Author: fwkoch

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 0.1.4
+current_version = 0.1.5
 files = properties/__init__.py setup.py docs/conf.py
 

docs/conf.py

@@ -58,17 +58,17 @@
 
 # General information about the project.
 project = u'properties'
-copyright = u'2016, 3point Science, Inc.'
-author = u'3point Science, Inc.'
+copyright = u'2016, 3point Science'
+author = u'3point Science'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1.4'
+version = u'0.1.5'
 # The full version, including alpha/beta/rc tags.
-release = u'0.1.4'
+release = u'0.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -248,7 +248,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'properties.tex', u'properties Documentation',
-     u'3point Science, Inc.', 'manual'),
+     u'3point Science', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

properties/__init__.py

@@ -22,7 +22,7 @@ class Profile(properties.PropertyClass):
 from .spatial import *
 from . import vmath
 
-__version__ = '0.1.4'
-__author__ = '3point Science, Inc.'
+__version__ = '0.1.5'
+__author__ = '3point Science'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2016 3point Science, Inc.'
+__copyright__ = 'Copyright 2016 3point Science,'

properties/array.py

@@ -55,7 +55,7 @@ def serialize(self, data):
             raise Exception('Must be a float or an int: {}'.format(data.dtype))
 
         data_file = tempfile.NamedTemporaryFile('rb+', suffix='.dat')
-        data_file.write(data.astype(use_dtype).tobytes())
+        data.astype(use_dtype).tofile(data_file.name)
         data_file.seek(0)
         return FileProp(data_file, use_dtype)
 
@@ -68,13 +68,11 @@ def shape(self, value):
         if not isinstance(value, tuple):
             raise TypeError("{}: Invalid shape - must be a tuple "
                             "(e.g. ('*',3) for an array of length-3 "
-                            "arrays)".format(value, self.name))
+                            "arrays)".format(value))
         for s in value:
             if s != '*' and not isinstance(s, six.integer_types):
                 raise TypeError("{}: Invalid shape - values "
-                                "must be '*' or int".format(
-                                    value, self.name
-                                ))
+                                "must be '*' or int".format(value))
         self._shape = value
 
     @property
@@ -88,7 +86,7 @@ def dtype(self, value):
         if (float not in value and
                 len(set(value).intersection(six.integer_types)) == 0):
             raise TypeError("{}: Invalid dtype - must be int "
-                            "and/or float".format(value, self.name))
+                            "and/or float".format(value))
         self._dtype = value
 
     def validator(self, instance, proposed):

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name="properties",
-    version="0.1.4",
+    version="0.1.5",
     packages=find_packages(),
     install_requires=['numpy>=1.7',
                       'pypng',