Merge pull request #46 from MiraGeoscience/release/3.1.0

Release/3.1.0

Author: andrewg-mira

README.rst

@@ -18,7 +18,7 @@ omf
     :alt: pytest
 
 
-Version: 3.0.1
+Version: 3.1.0
 
 API library for Open Mining Format, a new standard for mining data backed by
 the `Global Mining Standards & Guidelines Group <https://gmggroup.org/>`_.

docs/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'3.0.0'
+version = u'3.1.0'
 # The full version, including alpha/beta/rc tags.
-release = u'3.0.0'
+release = u'3.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

omf/__init__.py

@@ -29,7 +29,7 @@
 from .texture import ImageTexture
 from .volume import VolumeElement, VolumeGridGeometry
 
-__version__ = "3.0.1"
+__version__ = "3.1.0"
 __author__ = "Global Mining Standards and Guidelines Group"
 __license__ = "MIT License"
 __copyright__ = "Copyright 2017 Global Mining Standards and Guidelines Group"

omf/fileio/fileio.py

@@ -1,11 +1,11 @@
 """fileio.py: OMF Writer and Reader for serializing to and from .omf files"""
 
+from __future__ import annotations
+
 import json
 import struct
 import uuid
 
-from six import string_types
-
 from omf.base import UidModel
 from omf.fileio.geoh5 import GeoH5Writer
 
@@ -36,13 +36,14 @@ class OMFWriter:
     in the binary blob.
     """
 
-    def __init__(self, project, fname):
+    def __init__(self, project: UidModel, fname: str, compression: int = 5):
         """Project serialization is performed on OMFWriter init
 
         Binary data is written during project serialization
         """
+
         if fname.endswith("geoh5"):
-            GeoH5Writer(project, fname)
+            GeoH5Writer(project, fname, compression=compression)
         else:
             if not fname.endswith(".omf"):
                 fname = fname + ".omf"
@@ -100,7 +101,7 @@ class OMFReader:
 
     def __init__(self, fopen):
         if isinstance(fopen, str):
-            fopen = open(fopen, "rb")
+            fopen = open(fopen, "rb")  # pylint: disable=R1732
         self._fopen = fopen
         fopen.seek(0, 0)
         self._uid, self._json_start = self.read_header()
@@ -157,8 +158,8 @@ def read_header(self):
         file_version = file_version[0 : len(__version__)]
         if file_version != __version__:
             raise ValueError(
-                "Version mismatch: file version {fv!r}, "
-                "reader version {rv!r}".format(fv=file_version, rv=__version__)
+                f"Version mismatch: file version {file_version!r}, "
+                f"reader version {__version__!r}"
             )
         uid = uuid.UUID(bytes=struct.unpack("<16s", self._fopen.read(16))[0])
         json_start = struct.unpack("<Q", self._fopen.read(8))[0]