ararpy 0.1.29__py3-none-any.whl → 0.1.30__py3-none-any.whl

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/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.dist-info → ararpy-0.1.30.dist-info}/METADATA

@@ -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.dist-info → ararpy-0.1.30.dist-info}/RECORD

@@ -10,7 +10,7 @@ ararpy/calc/histogram.py,sha256=0GVbDdsjd91KQ1sa2B7NtZ4KGo0XpRIJapgIrzAwQUo,5777
 ararpy/calc/isochron.py,sha256=ej9G2e68k6yszonWHsLcEubh3TA7eh1upTJP_X0ttAA,5726
 ararpy/calc/jvalue.py,sha256=OL5zPYU8Pac-wOxUWPCgu3onh2n01xDnhpi2mlUsjJM,1146
 ararpy/calc/plot.py,sha256=sUqjKBdAEjFarUoSCLqf8cbUM0rEAdZhmtyXB2K7LkA,2139
-ararpy/calc/raw_funcs.py,sha256=UC01lvA6GyZ5FJv43jgoUULAFoLnZJMxeSa0BeVFCAM,2637
+ararpy/calc/raw_funcs.py,sha256=UPwXlYBwE1ugYRD9rsOs8JqJtm14FGcpWmUpUYJ4Roc,2744
 ararpy/calc/regression.py,sha256=mHUKobKx-Q9c7E49vPoQA2tA-MwO9BWvCp3VfnuUhUA,39776
 ararpy/calc/spectra.py,sha256=_Q23eP9necHlaCoHf3_UfW1N3JmVZj5rcWFro8GS-CA,1995
 ararpy/examples/022_VU124-M11a.ahd,sha256=3m0Gd-ZObou3KsnRNFMf77QwzT1Uz3nu3vA33Sqeyng,5414
@@ -37,7 +37,7 @@ ararpy/files/arr_file.py,sha256=KqksGlEA6nmMQofTgi7v45flscQZVtefxaNCKrV3Am4,837
 ararpy/files/basic.py,sha256=nc7Hgo_qLSkdmtKzZmd5SQ8Jy0dhW46ly4gh-oisUDs,2095
 ararpy/files/calc_file.py,sha256=wbt-cQhPnFJ32QyofXvjCPPehmWSj4CHnidkrP7dFgk,28694
 ararpy/files/new_file.py,sha256=efblARIBROVLWS2w3-98BxLX5VZ8grRpiTkJFtf_rAk,214
-ararpy/files/raw_file.py,sha256=PSJ0WwZHSIRrNDre69UwzpGevZQkI7utqhm9aKAm_Rs,20797
+ararpy/files/raw_file.py,sha256=AUvx5Uh3aTQvGy7mXQ7771CeqFZ8u-KgdJvVOD-pU8k,21557
 ararpy/files/xls.py,sha256=DVcZ_yRnc19p-m4leGGjt-YPDpSa2udYKmGyrM0qub0,640
 ararpy/smp/EXPORT_TO_PDF_DATA_PROPERTIES.py,sha256=baDM437tu6hsPv0uYfod0TREXlPd6kvMBFT1S9ZZlkk,3024
 ararpy/smp/__init__.py,sha256=k6_fa27UJsQK7K7oC5GYlwMo6l0Xd8af3QtOrZz2XJk,478
@@ -59,8 +59,8 @@ ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=Q97zfe2h2RaxADkoBAqd0uEiP16BFOajrTmXHMkL2EQ,25502
 ararpy/thermo/basic.py,sha256=nBGHI9uK7VdJwThwBIOcKAzdnYqPyQseFoY6s4zKizk,11504
-ararpy-0.1.29.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.1.29.dist-info/METADATA,sha256=4OPGl6KfTwxwSI6oU5gcILqUjMTrazzzhC-acKZ54MY,24516
-ararpy-0.1.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ararpy-0.1.29.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.1.29.dist-info/RECORD,,
+ararpy-0.1.30.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.1.30.dist-info/METADATA,sha256=OkwCC5DEb-8Q_ZtpeNhcLuYsBvA6nzyVQ6ZMpRYjkko,24516
+ararpy-0.1.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ararpy-0.1.30.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.1.30.dist-info/RECORD,,