ararpy 0.2.1__tar.gz → 0.2.2__tar.gz

{ararpy-0.2.1 → ararpy-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.2.1
+Version: 0.2.2
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu
@@ -12,6 +12,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: chardet
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: parse
+Requires-Dist: scipy
+Requires-Dist: xlrd
+Requires-Dist: XlsxWriter
+Requires-Dist: pdf_maker
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -20,6 +28,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file
+Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 

{ararpy-0.2.1 → ararpy-0.2.2}/ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.2.01'
+version = '0.2.2'
 __version__ = version
 full_version = version
-last_update = '2025-12-31'
+last_update = '2026-01-01'
 
 """ ArArPy Functions """
 

{ararpy-0.2.1 → ararpy-0.2.2}/ararpy/calc/jvalue.py

@@ -32,8 +32,10 @@ def j_value(age, sage, r, sr, f, rsf):
     f = f * 1000000  # exchange to unit of Ma
     rsf = f * rsf / 100  # exchange to absolute error
     k0 = (np.exp(f * age) - 1) / r
-    v1 = rsf ** 2 * (age * np.exp(f * age) / r) ** 2
-    v2 = sage ** 2 * (f * np.exp(f * age) / r) ** 2
-    v3 = sr ** 2 * ((1 - np.exp(f * age)) / r ** 2) ** 2
-    k1 = np.sqrt(v1 + v2 + v3)
-    return k0, k1, k1, k1
+    v1 = rsf ** 2 * (age * np.exp(f * age) / r) ** 2  # lambda
+    v2 = sage ** 2 * (f * np.exp(f * age) / r) ** 2  # age
+    v3 = sr ** 2 * ((1 - np.exp(f * age)) / r ** 2) ** 2  # 40/39
+    k1 = np.sqrt(v3)
+    k2 = np.sqrt(v3 + v2)
+    k3 = np.sqrt(v3 + v2 + v1)
+    return k0, k1, k2, k3

{ararpy-0.2.1 → ararpy-0.2.2}/ararpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.2.1
+Version: 0.2.2
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu
@@ -12,6 +12,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: chardet
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: parse
+Requires-Dist: scipy
+Requires-Dist: xlrd
+Requires-Dist: XlsxWriter
+Requires-Dist: pdf_maker
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -20,6 +28,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file
+Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 

{ararpy-0.2.1 → ararpy-0.2.2}/ararpy.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ ararpy/test.py
 ararpy.egg-info/PKG-INFO
 ararpy.egg-info/SOURCES.txt
 ararpy.egg-info/dependency_links.txt
+ararpy.egg-info/requires.txt
 ararpy.egg-info/top_level.txt
 ararpy/calc/__init__.py
 ararpy/calc/age.py

ararpy-0.2.2/ararpy.egg-info/requires.txt

@@ -0,0 +1,8 @@
+chardet
+numpy
+pandas
+parse
+scipy
+xlrd
+XlsxWriter
+pdf_maker

{ararpy-0.2.1 → ararpy-0.2.2}/setup.py

@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setuptools.setup(
     name='ararpy',  #
-    version='0.2.01',  # version
+    version='0.2.2',  # version
     author='Yang Wu',
     author_email='wuycug@hotmail.com',
     description='A project for Ar-Ar geochronology',  # short description
@@ -25,10 +25,10 @@ setuptools.setup(
     url='https://github.com/wuyangchn/ararpy.git',  # github url
     packages=setuptools.find_packages(),
     package_data={'ararpy': ['examples/*']},
-    # install_requires=[
-    #     "chardet", "numpy", "OriginExt", "pandas", "parse", "python_dateutil",
-    #     "scipy", "setuptools", "xlrd", "XlsxWriter", "pdf_maker"
-    # ],
+    install_requires=[
+        "chardet", "numpy", "pandas", "parse",
+        "scipy", "xlrd", "XlsxWriter", "pdf_maker"
+    ],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Programming Language :: Python :: 3',