Merge pull request #1554 from rstudio/r-devel-fixes

R-devel fixes

.github/workflows/R-CMD-check.yaml

@@ -37,7 +37,7 @@ jobs:
           - { os: ubuntu-latest, r: 'release', python: '3.11' }
           - { os: ubuntu-latest, r: 'release', python: '3.12' }
 
-          # - { os: ubuntu-latest, r: 'devel', python: '3.12', http-user-agent: 'release' }
+          - { os: ubuntu-latest, r: 'devel', python: '3.12', http-user-agent: 'release' }
 
           # test with one debug build of python
           # disabled; failing presently
@@ -74,11 +74,10 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: rcmdcheck local::.
-          cache-version: 3
+          extra-packages: any::rcmdcheck local::.
+          cache-version: 4
           upgrade: 'TRUE'
 
-
       - name: setup r-reticulate venv
         shell: Rscript {0}
         run: |

R/conversion.R

@@ -93,7 +93,7 @@ r_to_py.POSIXt <- function(x, convert = FALSE) {
 
 #' @export
 py_to_r.datetime.datetime <- function(x) {
-  if (py_version() >= 3L) {
+  if (py_version() >= "3") {
     tz <- NULL
     if (!is.null(x$tzinfo)) {
 

tests/testthat/test-python-classes.R

@@ -14,7 +14,7 @@ test_that("Python class members can be called via $", {
 test_that("py_has_method()", {
   # in python2, unbound methods are still methods
   # in python3, only bound, user-defined, functions are methods
-  skip_if(py_version() < 3)
+  skip_if(py_version() < "3")
   Fraction <- import("fractions")$Fraction
 
   expect_false(py_has_method(Fraction, "conjugate"))

tests/testthat/test-python-datetime.R

@@ -58,7 +58,7 @@ test_that("R datetimes can be passed to Python functions", {
 test_that("timezone information is not lost during conversion", {
 
   skip_if_no_python()
-  skip_if(py_version() < 3)
+  skip_if(py_version() < "3")
 
   datetime <- import("datetime", convert = FALSE)
   if (!py_has_attr(datetime, "timezone"))