ararpy 0.1.33__tar.gz → 0.1.34__tar.gz

{ararpy-0.1.33 → ararpy-0.1.34}/PKG-INFO

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

{ararpy-0.1.33 → ararpy-0.1.34}/ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.1.33'
+version = '0.1.34'
 __version__ = version
 full_version = version
-last_update = '2025-10-01'
+last_update = '2025-10-22'
 
 """ ArArPy Functions """
 

{ararpy-0.1.33 → ararpy-0.1.34}/ararpy/calc/plot.py

@@ -53,9 +53,8 @@ def get_axis_scale(data: list, count=6, increment=None, extra_count=0, min_inter
             str(decimal.Decimal(int(interval / mag // min_interval) + min_interval) * decimal.Decimal(str(mag))))
     else:
         increment = decimal.Decimal(increment)
-    start = decimal.Decimal(0)
+    start = decimal.Decimal(_min) // increment * increment
     if _min < 0:
-        start = -increment
         while start > _min:
             start -= increment
     else:

{ararpy-0.1.33 → ararpy-0.1.34}/ararpy/files/calc_file.py

@@ -291,8 +291,8 @@ def open_240(data: pd.DataFrame, logs01: pd.DataFrame, logs02: pd.DataFrame):
         -999, -999, -999, -999, -999, -999, -999, -999,
         # 123-130
         -999, -999, -999, -999, -999, -999, -999, -999,
-        # 131-135
-        -999, -999, -999, -999, -999,
+        # 131-137
+        -999, -999, -999, -999, -999, -999, -999,
     ]
 
     # double transpose to remove keys
@@ -591,9 +591,9 @@ class ArArCalcFile:
         book_contents = read_calc_file(self.file_path)
         # create data frames for book values
         content = pd.DataFrame(book_contents['Data Tables'])
-        logs01 = pd.DataFrame(book_contents['Logs01'])
-        logs02 = pd.DataFrame(book_contents['Logs02'])
-        logs03 = pd.DataFrame(book_contents['Logs03'])
+        logs01 = pd.DataFrame(book_contents.get('Logs01', [[]]))
+        logs02 = pd.DataFrame(book_contents.get('Logs02', [[]]))
+        logs03 = pd.DataFrame(book_contents.get('Logs03', [[]]))
 
         start_row = 5
         sequence_num = int(logs03[2][0])
@@ -613,7 +613,7 @@ class ArArCalcFile:
             material = data[46][0]
             analyst = data[48][0]
         else:
-            raise ValueError(f'non-supported version: {version}')
+            raise ValueError(f'Unsupported version: {version}')
 
         # change error type, 2sigma to 1sigma..., relative errors to absolute errors
         data = change_error_type(data, header)

{ararpy-0.1.33 → ararpy-0.1.34}/ararpy/smp/plots.py

@@ -247,10 +247,10 @@ def get_isochron_results(data: list, smp: Sample, sequence, figure_type: int = 0
 
     if len(sequence) < 3:
         return iso_res
-    regression_method = {
-        "york-2": calc.regression.york2, "olst": calc.regression.olst
-    }.get(smp.TotalParam[97][min(sequence)].lower(), calc.regression.york2)
     try:
+        regression_method = {
+            "york-2": calc.regression.york2, "olst": calc.regression.olst
+        }.get(smp.TotalParam[97][min(sequence)].lower(), calc.regression.york2)
         regression_res = regression_method(*data[:5])
     except (Exception, BaseException):
         # print(f"Warning: {traceback.format_exc()}")

{ararpy-0.1.33 → ararpy-0.1.34}/ararpy.egg-info/PKG-INFO

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

{ararpy-0.1.33 → ararpy-0.1.34}/setup.py

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