AMR 2.1.1.9220__py3-none-any.whl → 2.1.1.9222__py3-none-any.whl

AMR/datasets.py

@@ -1,45 +1,43 @@
 import os
 import sys
-from rpy2 import robjects
-from rpy2.robjects import pandas2ri
-from rpy2.robjects.packages import importr, isinstalled
 import pandas as pd
 import importlib.metadata as metadata
 
 # Get the path to the virtual environment
 venv_path = sys.prefix
-
-# Define R library path within the venv
 r_lib_path = os.path.join(venv_path, "R_libs")
-# Ensure the R library path exists
 os.makedirs(r_lib_path, exist_ok=True)
 
+# Set environment variable before importing rpy2
+os.environ['R_LIBS_SITE'] = r_lib_path
+
+from rpy2 import robjects
+from rpy2.robjects import pandas2ri
+from rpy2.robjects.packages import importr, isinstalled
+
 # Import base and utils
 base = importr('base')
 utils = importr('utils')
 
-base.options(warn = -1)
-
-# Override R library paths globally for the session
-robjects.r(f'.Library.site <- "{r_lib_path}"')  # Replace site-specific library
-base._libPaths(r_lib_path)  # Override .libPaths() as well
+base.options(warn=-1)
 
-# Get the effective library path
-r_amr_lib_path = base._libPaths()[0]
+# Ensure library paths explicitly
+base._libPaths(r_lib_path)
 
 # Check if the AMR package is installed in R
-if not isinstalled('AMR', lib_loc=r_amr_lib_path):
-    print(f"AMR: Installing latest AMR R package to {r_amr_lib_path}...", flush=True)
+if not isinstalled('AMR', lib_loc=r_lib_path):
+    print(f"AMR: Installing latest AMR R package to {r_lib_path}...", flush=True)
     utils.install_packages('AMR', repos='https://msberends.r-universe.dev', quiet=True)
 
-# Python package version of AMR
+# Retrieve Python AMR version
 try:
     python_amr_version = metadata.version('AMR')
 except metadata.PackageNotFoundError:
     python_amr_version = ''
 
-# R package version of AMR
-r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_amr_lib_path}"))')
+# Retrieve R AMR version
+r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')
+r_amr_version = str(r_amr_version[0])
 
 print(python_amr_version)
 print(r_amr_version)
@@ -47,7 +45,7 @@ print(r_amr_version)
 # Compare R and Python package versions
 if r_amr_version != python_amr_version:
     try:
-        print(f"AMR: Updating AMR package in {r_amr_lib_path}...", flush=True)
+        print(f"AMR: Updating AMR package in {r_lib_path}...", flush=True)
         utils.install_packages('AMR', repos='https://msberends.r-universe.dev', quiet=True)
     except Exception as e:
         print(f"AMR: Could not update: {e}", flush=True)

{amr-2.1.1.9220.dist-info → amr-2.1.1.9222.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: AMR
-Version: 2.1.1.9220
+Version: 2.1.1.9222
 Summary: A Python wrapper for the AMR R package
 Home-page: https://github.com/msberends/AMR
 Author: Matthijs Berends

amr-2.1.1.9222.dist-info/RECORD

@@ -0,0 +1,7 @@
+AMR/__init__.py,sha256=CqpcLv7M6mte09zdHYPzBuHJQeFAqJ4s2uN_rExYfoM,7730
+AMR/datasets.py,sha256=BwauDkIaXKnIrIxxMc8oa46PPnvC1FQOrr_9aMo0uwo,2496
+AMR/functions.py,sha256=91Tl9Jh6sbu-1xUvlst9VyQB5HJOe6ZCNhjtPpnLuik,46722
+amr-2.1.1.9222.dist-info/METADATA,sha256=7_VWyOKNs1uFKZm1-t-O7fDfENV-vAvoZRKmhv0vaDg,10095
+amr-2.1.1.9222.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+amr-2.1.1.9222.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
+amr-2.1.1.9222.dist-info/RECORD,,

{amr-2.1.1.9220.dist-info → amr-2.1.1.9222.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

amr-2.1.1.9220.dist-info/RECORD

@@ -1,7 +0,0 @@
-AMR/__init__.py,sha256=CqpcLv7M6mte09zdHYPzBuHJQeFAqJ4s2uN_rExYfoM,7730
-AMR/datasets.py,sha256=Fc9Ogxehhthw2T7qVc758zWdYkkztDYyWH4RRMwekcI,2667
-AMR/functions.py,sha256=91Tl9Jh6sbu-1xUvlst9VyQB5HJOe6ZCNhjtPpnLuik,46722
-amr-2.1.1.9220.dist-info/METADATA,sha256=IC1zGwCDMXU4UIika_3fe6Vw6V2Lqu_fiRqg0tEVXtk,10095
-amr-2.1.1.9220.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-amr-2.1.1.9220.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
-amr-2.1.1.9220.dist-info/RECORD,,