Merge branch 'master' of https://github.com/aranzgeo/omf

Author: fwkoch

.pypirc.enc

@@ -0,0 +1,2 @@
+�������;�4�g�s��t�\�<��fO�ЋY��}�7�s�][k�����Pt���̓
+ĥ�-��ll�ڶ��^2r��=�s%ͬ����UE3��

.travis.yml

@@ -24,9 +24,13 @@ script:
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
+  - openssl aes-256-cbc -K $encrypted_de81f81dc49e_key -iv $encrypted_de81f81dc49e_iv -in .pypirc.enc -out ~/.pypirc -d
   - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a $TRAVIS_PYTHON_VERSION == "2.7" -a -n "$(grep version setup.py | cut -d \' -f 2 | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$')" ]; then
       make publish;
     fi
   - if [ "$TRAVIS_BRANCH" = "beta" -a "$TRAVIS_PULL_REQUEST" = "false" -a $TRAVIS_PYTHON_VERSION == "2.7" -a -n "$(grep version setup.py | cut -d \' -f 2 | grep -E '^[0-9]+\.[0-9]+\.[0-9]+b[0-9]+$')" ]; then
       make publish;
     fi
+
+notifications:
+  email: false

README.rst

@@ -59,7 +59,7 @@ Connections
 
 This library makes use of the `properties <https://github.com/3ptscience/properties>`_
 open-source project, which is designed and publicly supported by
-`3point Science <https://3ptscience.com>`_, an
+`3point Science <https://www.3ptscience.com>`_, an
 `ARANZ Geo Limited <http://www.aranzgeo.com>`_ company.
 
 Installation

omf/serializers.py

@@ -8,7 +8,10 @@
 import zlib
 
 import numpy as np
+from six import PY2
 
+if PY2:
+    memoryview = buffer                                                        #pylint: disable=redefined-builtin, invalid-name, undefined-variable
 
 def array_serializer(arr, open_file, **kwargs):                                #pylint: disable=unused-argument
     """Convert array data to a serialized binary format"""
@@ -34,7 +37,7 @@ def array_serializer(arr, open_file, **kwargs):                                #
     index = dict()
     index['start'] = open_file.tell()
     index['dtype'] = dtype
-    arr_buffer = np.getbuffer(arr.astype(dtype))
+    arr_buffer = memoryview(arr.astype(dtype))
     open_file.write(zlib.compress(arr_buffer))
     index['length'] = open_file.tell() - index['start']
     return index