ararpy 0.1.29__tar.gz → 0.1.30__tar.gz

{ararpy-0.1.29 → ararpy-0.1.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.1.29
+Version: 0.1.30
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu

{ararpy-0.1.29 → ararpy-0.1.30}/ararpy/calc/raw_funcs.py

@@ -29,6 +29,9 @@ def get_raw_data_regression_results(points_data, unselected: list = None):
     -------
 
     """
+    def power(a0, a1):
+        # return regression.power(a0, a1)
+        raise ValueError("Deprecated regression")
     # if unselected is None:
     #     unselected = []
     # linesData = []
@@ -36,7 +39,7 @@ def get_raw_data_regression_results(points_data, unselected: list = None):
     # un_x = transpose(unselected)[0] if is_twoD(unselected) else []
     reg_handler = [
         regression.linest, regression.quadratic, regression.exponential,
-        regression.power, regression.average]
+        power, regression.average]
     # size = 50
     # lines_x = [(max(x + un_x) - 0) / size * i for i in range(size + 1)]
     for i in range(len(reg_handler)):

{ararpy-0.1.29 → ararpy-0.1.30}/ararpy/files/raw_file.py

@@ -22,6 +22,7 @@ from parse import parse as string_parser
 import dateutil.parser as datetime_parser
 from ..calc.arr import get_item
 from ..calc.basic import utc_dt
+from ..smp.sample import RawData
 
 """ Open raw data file """
 
@@ -211,8 +212,28 @@ def open_raw_xls(file_path, input_filter: List[Union[str, int]]):
 
 
 def open_raw_seq(file_path, input_filter=None):
+
+    class RenameUnpickler(pickle.Unpickler):
+        def find_class(self, module: str, name: str):
+            MODULE = RawData().__module__
+            renamed_module = module
+            if '.sample' in module and module != MODULE:
+                renamed_module = MODULE
+            try:
+                return super(RenameUnpickler, self).find_class(renamed_module, name)
+            except AttributeError:
+                return super(RenameUnpickler, self).find_class(renamed_module, 'ArArBasic')
+
+    def renamed_load(file_obj):
+        return RenameUnpickler(file_obj).load()
+
     with open(file_path, 'rb') as f:
-        sequences = pickle.load(f)
+        sequences = renamed_load(f)
+
+    # with open(file_path, 'rb') as f:
+    #     sequences = pickle.load(f)
+    #     print(sequences[0].__module__)
+
     name_list = []
     for seq in sequences:
         while seq.name in name_list:

{ararpy-0.1.29 → ararpy-0.1.30}/ararpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.1.29
+Version: 0.1.30
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu

{ararpy-0.1.29 → ararpy-0.1.30}/setup.py

@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setuptools.setup(
     name='ararpy',  #
-    version='0.1.29',  # version
+    version='0.1.30',  # version
     author='Yang Wu',
     author_email='wuycug@hotmail.com',
     description='A project for Ar-Ar geochronology',  # short description