Merge pull request #15 from maxibor/dev

Fix picke protocol issues
maxibor · Nov 18, 2020 · 5b8c0c9 · 5b8c0c9
2 parents d987d51 + a142469
commit 5b8c0c9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/pydamage/__init__.py b/pydamage/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.50"
+__version__ = "0.50beta"
 from pydamage.main import analyze
diff --git a/pydamage/accuracy_model.py b/pydamage/accuracy_model.py
@@ -2,14 +2,16 @@
 import pandas as pd
 import numpy as np
 import pickle
+import gzip
 
 
 def load_model():
     """Returns the pmml model"""
-    stream = pkg_resources.resource_stream(
-        __name__, "models/accuracy_model_v2_python.pickle"
+    model_path = pkg_resources.resource_stream(
+        __name__, "models/accuracy_model_v2_python.pickle.gz"
     )
-    return pickle.load(stream)
+    with gzip.open(model_path, 'rb') as mod:
+        return pickle.load(mod)
 
 
 def prepare_data(pd_df):

diff --git a/pydamage/models/accuracy_model_v2_python.pickle b/pydamage/models/accuracy_model_v2_python.pickle
diff --git a/pydamage/models/accuracy_model_v2_python.pickle.gz b/pydamage/models/accuracy_model_v2_python.pickle.gz
diff --git a/setup.py b/setup.py
@@ -36,10 +36,10 @@ def get_version(rel_path):
         "statsmodels",
         "matplotlib",
         "tqdm",
-        "biopython",
+        "biopython"    
     ],
     packages=find_packages(include=["pydamage"]),
     entry_points={"console_scripts": ["pydamage = pydamage.cli:cli"]},
     include_package_data=True,
-    package_data={"": ["models/accuracy_model_v2_python.pickle"]},
+    package_data={"": ["models/accuracy_model_v2_python.pickle.gz"]},
 )