rpy2 · lgautier · Feb 16, 2025 · Feb 16, 2025 · Feb 16, 2025 · Feb 16, 2025
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -85,9 +85,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.12"]
         r-version: [release]
-        os: ["windows-latest", ubuntu-latest, macos-14, macos-15]
+        os: ["windows-latest"]
         exclude:
           - os: macos-14
             python-version: 3.9
@@ -190,9 +190,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.12"]
         r-version: [release]
-        os: ["windows-latest", ubuntu-latest, macos-14]
+        os: ["windows-latest"]
         exclude:
           - os: macos-14
             python-version: 3.9

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -79,7 +79,12 @@ jobs:
         echo "With dev for rpy2-rinterface."
         python3 -m pip install --pre ${{ env.RPY2_ROBJECTS_WHL_DIST }}'[test_minimal]'
         ${{ env.R_LIBRARY }}
-        python -c 'from rpy2.rinterface_lib import openrlib; print(openrlib.cffi_mode)'
+        echo 'initr()'
+        python -c 'import rpy2.rinterface as ri; ri.initr()'
+        echo 'print pi'
+        python -c 'import rpy2.rinterface as ri; ri.initr(); print(ri.baseenv["pi"])'
+        echo 'print rep'
+        python -c 'import rpy2.rinterface as ri; ri.initr(); print(ri.baseenv["rep"](1, 2))'
         bash -e ./scripts/run_test_min_deps.sh
     - name: Test with numpy
       run: |

diff --git a/rpy2-rinterface/src/rpy2/rinterface_lib/_rinterface_capi.py b/rpy2-rinterface/src/rpy2/rinterface_lib/_rinterface_capi.py
@@ -15,7 +15,6 @@
 
 from _cffi_backend import FFI  # type: ignore
 
-
 logger = logging.getLogger(__name__)
 # Preserve cdata allocated by cffi from garbage collection.
 __cffi_protected = {}
@@ -333,12 +332,13 @@ def build_rcall(rfunction,
 
 def _evaluated_promise(function):
     def _(*args, **kwargs):
-        robj = function(*args, **kwargs)
-        if _TYPEOF(robj) == openrlib.rlib.PROMSXP:
-            robj = openrlib.rlib.Rf_eval(
-                robj,
-                openrlib.rlib.R_GlobalEnv)
-        return robj
+        with memorymanagement.rmemory() as rmemory:
+            robj = rmemory.protect(function(*args, **kwargs))
+            if _TYPEOF(robj) == openrlib.rlib.PROMSXP:
+                robj = openrlib.rlib.Rf_eval(
+                    robj,
+                    openrlib.rlib.R_GlobalEnv)
+            return robj
     return _
 
 
@@ -640,6 +640,7 @@ def _register_external_symbols() -> None:
           python_callback,
           -1],
          [ffi.NULL, ffi.NULL, 0]])
+
     openrlib.rlib.R_registerRoutines(
         openrlib.rlib.R_getEmbeddingDllInfo(),
         ffi.NULL,

diff --git a/rpy2-rinterface/src/rpy2/rinterface_lib/embedded.py b/rpy2-rinterface/src/rpy2/rinterface_lib/embedded.py
@@ -4,6 +4,7 @@
 import sys
 import typing
 import warnings
+import rpy2.situation
 from rpy2.rinterface_lib import openrlib
 from rpy2.rinterface_lib import callbacks
 if os.name == 'nt':
@@ -22,6 +23,8 @@
 
 
 class Is_RStart(Protocol):
+    """Type-checking helper."""
+
     @property
     def rhome(self): ...
 
@@ -216,7 +219,7 @@ def _setcallback(rlib, rlib_symbol: str,
       the new callback function
     :param callbacks: Namespace in which to find the callback function.
     :param callbacks_symbol: Symbol (name) of the new callback function.
-"""
+    """
     if callback_symbol is None:
         new_callback = ffi.NULL
     else:
@@ -263,12 +266,7 @@ def _initr(
             _c_stack_limit = _DEFAULT_C_STACK_LIMIT
 
         rlib = openrlib.rlib
-        ffi_proxy = openrlib.ffi_proxy
-        if (
-                ffi_proxy.get_ffi_mode(openrlib._rinterface_cffi)
-                ==
-                ffi_proxy.InterfaceType.ABI
-        ):
+        if openrlib.cffi_mode is rpy2.situation.CFFI_MODE.ABI:
             callback_funcs = callbacks
         else:
             callback_funcs = rlib

diff --git a/rpy2-rinterface/src/rpy2/rinterface_lib/embedded_mswin.py b/rpy2-rinterface/src/rpy2/rinterface_lib/embedded_mswin.py
@@ -1,5 +1,6 @@
 import sys
 import typing
+import rpy2.situation
 from rpy2.rinterface_lib import embedded
 from rpy2.rinterface_lib import callbacks
 from rpy2.rinterface_lib import openrlib
@@ -28,23 +29,37 @@
 
 def _build_rstart(rhome, interactive, setcallbacks):
     rstart = ffi.new('Rstart')
+    # TODO: Where should rstart be protected?
+    embedded.rstart = rstart
     __cffi_protected['rstart'] = rstart
     openrlib.rlib.R_DefParams(rstart)
+    # TODO: A cleanup / consolidation of "R HOME"
+    # definition is needed.
+    print(f'rhome: {rhome}')
     rstart.rhome = rhome
     userhome = ffi.new("char[]", ffi.string(openrlib.rlib.getRUser()))
     __cffi_protected['userhome'] = userhome
     rstart.home = userhome
-    rstart.CharacterMode = openrlib.rlib.LinkDLL
-    if setcallbacks:
-        for rstart_name, callback_name in CALLBACK_INIT_PAIRS:
-            if callback_name is not None:
-                setattr(rstart, rstart_name,
-                        getattr(callbacks, callback_name))
 
     rstart.R_Quiet = True
+    rstart.R_Slave = False
     rstart.R_Interactive = interactive
+    # TODO: Force verbose for now.
+    rstart.R_Verbose = True
+    rstart.LoadSiteFile = True
+    rstart.LoadInitFile = True
     rstart.RestoreAction = openrlib.rlib.SA_RESTORE
     rstart.SaveAction = openrlib.rlib.SA_NOSAVE
+    rstart.CharacterMode = openrlib.rlib.LinkDLL  # 1?
+    if setcallbacks:
+        if openrlib.cffi_mode is rpy2.situation.CFFI_MODE.ABI:
+            callback_funcs = callbacks
+        else:
+            callback_funcs = openrlib.rlib
+
+        for rstart_symbol, callback_symbol in CALLBACK_INIT_PAIRS:
+            embedded._setcallback(rstart, rstart_symbol,
+                                  callback_funcs, callback_symbol)
 
     rstart.vsize = ffi.cast('size_t', _DEFAULT_VSIZE)
     rstart.nsize = ffi.cast('size_t', _DEFAULT_NSIZE)
@@ -79,11 +94,12 @@ def _initr_win32(
         if embedded.isinitialized():
             return None
 
-        options_c = [ffi.new('char[]', o.encode('ASCII'))
+        options_c = [ffi.new('char[]', o.encode('utf-8'))
                      for o in embedded._options]
-        n_options = len(options_c)
-        n_options_c = ffi.cast('int', n_options)
-        status = openrlib.rlib.Rf_initEmbeddedR(n_options_c, options_c)
+        status = openrlib.rlib.Rf_initEmbeddedR(len(options_c),
+                                                ffi.new('char *[]', options_c))
+        # status = openrlib.rlib.Rf_initialize_R(len(options_c),
+        #                                        ffi.new('char *[]', options_c))
         embedded._setinitialized()
 
         rhome = openrlib.rlib.get_R_HOME()
@@ -93,5 +109,7 @@ def _initr_win32(
 
         # TODO: still needed ?
         openrlib.rlib.R_CStackLimit = ffi.cast('uintptr_t', _c_stack_limit)
+        # Restore if using Rf_initialize_R ?
+        # openrlib.rlib.setup_Rmainloop()
 
         return status
diff --git a/rpy2-rinterface/src/rpy2/rinterface_lib/openrlib.py b/rpy2-rinterface/src/rpy2/rinterface_lib/openrlib.py
@@ -56,6 +56,7 @@
     raise ImportError(
         f'cffi mode requested invalid: {cffi_mode_request}'
     )
+
 ffi = _rinterface_cffi.ffi
 
 lock = threading.Lock()

diff --git a/scripts/run_test_min_deps.sh b/scripts/run_test_min_deps.sh
@@ -2,15 +2,26 @@
 set -e
 set -x
 
+# python doc/_static/demos/example01.py
+
 pytest \
+    --verbose
+    --cov-report=xml \
+    --cov-report=term \
+    --cov=rpy2.rinterface_lib \
+    --cov=rpy2.rinterface \
+    --cov=rpy2.rlike \
+    ./rpy2-rinterface/src/rpy2/rinterface/tests
+
+pytest \
+    --cov-append \
     --cov-report=xml \
     --cov-report=term \
     --cov=rpy2.rinterface_lib \
     --cov=rpy2.rinterface \
     --cov=rpy2.rlike \
     --cov=rpy2.ipython \
     --cov=rpy2.robjects \
-    ./rpy2-rinterface/src/rpy2/rinterface/tests \
     ./rpy2-robjects/src/rpy2/robjects/tests
 
 pytest \