AMR 2.1.1.9221__py3-none-any.whl → 2.1.1.9223__py3-none-any.whl

AMR/datasets.py

@@ -1,54 +1,51 @@
 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)
+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
-
-# 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
-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}"))')
-r_amr_version = str(r_amr_version[0])
-
-# 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)
-        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)
+# # Retrieve Python AMR version
+# try:
+#     python_amr_version = metadata.version('AMR')
+# except metadata.PackageNotFoundError:
+#     python_amr_version = ''
+# 
+# # 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])
+# 
+# # Compare R and Python package versions
+# if r_amr_version != python_amr_version:
+#     try:
+#         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)
 
 print(f"AMR: Setting up R environment and AMR datasets...", flush=True)
 

{amr-2.1.1.9221.dist-info → amr-2.1.1.9223.dist-info}/METADATA

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

amr-2.1.1.9223.dist-info/RECORD

@@ -0,0 +1,7 @@
+AMR/__init__.py,sha256=CqpcLv7M6mte09zdHYPzBuHJQeFAqJ4s2uN_rExYfoM,7730
+AMR/datasets.py,sha256=d-Tq77qFwR-m5Shc2n4BfHy6GYJW5A14w_dHU_Ndtc4,2482
+AMR/functions.py,sha256=91Tl9Jh6sbu-1xUvlst9VyQB5HJOe6ZCNhjtPpnLuik,46722
+amr-2.1.1.9223.dist-info/METADATA,sha256=U9k02aw6d9rVYv5e3HjPLpzqVJpoSaLJK4ed1vhOD5A,10095
+amr-2.1.1.9223.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+amr-2.1.1.9223.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
+amr-2.1.1.9223.dist-info/RECORD,,

amr-2.1.1.9221.dist-info/RECORD

@@ -1,7 +0,0 @@
-AMR/__init__.py,sha256=CqpcLv7M6mte09zdHYPzBuHJQeFAqJ4s2uN_rExYfoM,7730
-AMR/datasets.py,sha256=_9pBp_J2NXDadNBkqI9PUIA-AkLUt5sAcxZX1t8H8-8,2657
-AMR/functions.py,sha256=91Tl9Jh6sbu-1xUvlst9VyQB5HJOe6ZCNhjtPpnLuik,46722
-amr-2.1.1.9221.dist-info/METADATA,sha256=3tqpnclwFaHAt5m0pfmHNz7IlWUWJiGvnrjKLIZvfG4,10095
-amr-2.1.1.9221.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-amr-2.1.1.9221.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
-amr-2.1.1.9221.dist-info/RECORD,,