More polish for different platfroms and checks

Author: gregorgorjanc

RcppTskit/.Rbuildignore

@@ -13,6 +13,7 @@
 ^cran-comments\.md$
 ^inst/examples/create_test\.trees\.R$
 ^inst/examples/create_test\.trees\.py$
+^LICENSE.md$
 ^notes_pkg_dev\.Rmd$
 ^pkg_dev_notes\.md$
 ^tests/testthat/_snaps$

RcppTskit/LICENSE.md

@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2026 Gregor Gorjanc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

RcppTskit/R/RcppTskit.R

@@ -30,7 +30,7 @@ get_tskit_py <- function(object_name = "tskit") {
   if (test) {
     tskit <- get(object_name, envir = .GlobalEnv, inherits = FALSE)
     test <- reticulate::is_py_object(tskit) &&
-      is(tskit) == "python.builtin.module"
+      is(tskit, "python.builtin.module")
     if (test) {
       return(tskit)
     } else {
@@ -43,22 +43,36 @@ get_tskit_py <- function(object_name = "tskit") {
     }
   }
   # else
-  # These lines are hard to hit with tests with cached reticulate Python and modules
+  # These lines are hard to hit with tests and cached reticulate Python and modules
   # nocov start
+  msgSuccess <- 'reticulate::py_require("tskit") succeded!'
+  msgFail <- 'reticulate::py_require("tskit") failed!'
+  e <- simpleError(msgFail)
   if (!reticulate::py_module_available("tskit")) {
     txt <- "Python module 'tskit' is not available. Attempting to install it ..."
     message(txt)
-    reticulate::py_require("tskit")
+    out <- tryCatch(
+      reticulate::py_require("tskit"),
+      error = function(s) e
+    )
+    if (is(out, "simpleError")) {
+      return(msgFail)
+    }
   }
-  # nocov end
-  return(reticulate::import("tskit", delay_load = TRUE))
+  msgFail <- 'reticulate::import("tskit") failed!'
+  e <- simpleError(msgFail)
+  out <- tryCatch(
+    reticulate::import("tskit", delay_load = TRUE),
+    error = function(e) e
+  )
+  return(out)
 }
 
 #' @describeIn get_tskit_py Test if \code{get_tskit_py} returned a reticulate Python module object
 #' @export
 check_tskit_py <- function(object, stop = FALSE) {
   test <- reticulate::is_py_object(object) &&
-    ("python.builtin.module" %in% is(object))
+    (is(object, "python.builtin.module"))
   if (test) {
     return(TRUE)
   } else {

RcppTskit/tests/testthat/test_get_tskit_py.R

@@ -26,7 +26,7 @@ test_that("get_tskit_py() works", {
   # lobstr::obj_addr(tskit)
   # "0x12218b910"
   expect_true(is_py_object(tskit))
-  expect_true(is(tskit) == "python.builtin.module")
+  expect_true(is(tskit, "python.builtin.module"))
   expect_equal(tskit$`__name__`, "tskit")
 
   # Testing that get_tskit_py() returns the same tskit object if it already exists