Add support for CentOS/RHEL 9 and derivatives

.github/workflows/build.yml

@@ -15,6 +15,7 @@ jobs:
         config:
         - {image: 'centos', tag: 'centos7', repo: 'quay.io/centos/'}
         - {image: 'centos', tag: 'stream8', repo: 'quay.io/centos/'}
+        - {image: 'centos', tag: 'stream9', repo: 'quay.io/centos/'}
         - {image: 'ubuntu', tag: '18.04',   repo: ''}
         - {image: 'ubuntu', tag: '20.04',   repo: ''}
         - {image: 'ubuntu', tag: '22.04',   repo: ''}
@@ -36,6 +37,14 @@ jobs:
         dnf install -y epel-release epel-next-release
         dnf install -y R-core
 
+    - name: Install dependencies (CentOS 9)
+      if: ${{ matrix.config.tag == 'stream9' }}
+      run: |
+        dnf install -y 'dnf-command(config-manager)'
+        dnf config-manager --set-enabled crb
+        dnf install -y epel-release epel-next-release
+        dnf install -y R-core
+
     - name: Install dependencies (Ubuntu)
       if: ${{ matrix.config.image == 'ubuntu' }}
       env:

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rspm
 Type: Package
 Title: 'RStudio' Package Manager
-Version: 0.2.3
+Version: 0.3.0
 Authors@R: c(
     person("Iñaki", "Ucar", email="iucar@fedoraproject.org",
       role=c("aut", "cph", "cre"), comment=c(ORCID="0000-0001-6403-5550")),
@@ -10,14 +10,14 @@ Description: Enables binary package installations on Linux distributions.
     Provides access to 'RStudio' public repositories at
     <https://packagemanager.rstudio.com>, and transparent management of
     system requirements without administrative privileges. Currently supported
-    distributions are 'CentOS' / 'RHEL' 7 and 8, and several 'RHEL' derivatives
-    ('Rocky Linux' 8, 'AlmaLinux' 8, 'Oracle Linux' 7 and 8, 'Amazon Linux' 2),
-    'openSUSE' / 'SLES' 15.3, and 'Ubuntu' 18.04, 20.04 and 22.04.
+    distributions are 'CentOS' / 'RHEL' 7-9, and several 'RHEL' derivatives
+    ('Rocky Linux', 'AlmaLinux', 'Oracle Linux', and 'Amazon Linux' 2),
+    'openSUSE' / 'SLES' 15.3-4, and 'Ubuntu' 18.04, 20.04 and 22.04.
 License: GPL-2 | GPL-3 | MIT + file LICENSE
 Copyright: file COPYRIGHTS
 Encoding: UTF-8
 OS_type: unix
 Suggests: renv, tinytest
 URL: https://enchufa2.github.io/rspm/
 BugReports: https://github.com/Enchufa2/rspm/issues
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.2

NEWS.md

@@ -1,3 +1,7 @@
+# rspm 0.3.0
+
+- Add support for CentOS/RHEL 9 and derivatives (#13 addressing #12).
+
 # rspm 0.2.3
 
 - Fix non-root unpacking for old rpm/dpkg versions (#11 addressing #9, #10).

R/integration.R

@@ -80,9 +80,9 @@ os <- function() {
   code <- switch(
     id <- strsplit(os$ID, "-")[[1]][1],
     "ubuntu" = os$VERSION_CODENAME,
-    "centos" = paste0(id, os$VERSION_ID),
-    "rocky"  = , "almalinux" = , "ol" = ,
-    "rhel"   = paste0("centos", strsplit(os$VERSION_ID, "\\.")[[1]][1]),
+    "centos" = , "rocky"  = , "almalinux" = , "ol" = , "rhel" =
+      paste0(if ((ver <- package_version(os$VERSION_ID)$major) < 9)
+        "centos" else "rhel", ver),
     "amzn"   = if (os$VERSION_ID == "2") "centos7" else
       stop("OS not supported", call.=FALSE),
     "sles"   = , "opensuse" =

R/rspm.R

@@ -4,9 +4,9 @@
 #' Provides access to RStudio public repositories at
 #' \url{https://packagemanager.rstudio.com}, and transparent management of
 #' system requirements without administrative privileges. Currently supported
-#' distributions are CentOS / RHEL 7 and 8, and several RHEL derivatives
-#' (Rocky Linux 8, AlmaLinux 8, Oracle Linux 7 and 8, Amazon Linux 2),
-#' openSUSE / SLES 15.3, and Ubuntu 18.04, 20.04 and 22.04.
+#' distributions are CentOS / RHEL 7-9, and several RHEL derivatives
+#' (Rocky Linux, AlmaLinux, Oracle Linux, Amazon Linux 2),
+#' openSUSE / SLES 15.3-4, and Ubuntu 18.04, 20.04 and 22.04.
 #'
 #' @author Iñaki Ucar
 #'

README.md

@@ -13,10 +13,10 @@
 - **Full integration** with the system package manager to resolve, download and
   configure system requirements automagically without leaving your R console.
 - **Fully user mode**, no root privileges required.
-- Support for **CentOS / RHEL** 7 and 8.
+- Support for **CentOS / RHEL** 7, 8 and 9.
 - Support for **RHEL derivatives**:
-  Rocky Linux 8, AlmaLinux 8, Oracle Linux 7 and 8, Amazon Linux 2.
-- Support for **openSUSE / SLES** 15.3.
+  Rocky Linux 8-9, AlmaLinux 8-9, Oracle Linux 7-9, Amazon Linux 2.
+- Support for **openSUSE / SLES** 15.3 and 15.4.
 - Support for **Ubuntu** 18.04, 20.04 and 22.04 (requires `apt-file`).
 
 Both R packages and system dependencies **are installed into the user home**.

cran-comments.md

@@ -1,8 +1,9 @@
-## Patch release
+## Minor release
+Add support for CentOS/RHEL 9 and derivatives.
 
 ## Test environments
 - ubuntu:22.04, ubuntu:20.04, ubuntu:18.04 on GitHub
-- centos:stream8, centos:centos7 on GitHub
+- centos:stream9, centos:stream8, centos:centos7 on GitHub
 
 ## R CMD check results
 0 errors | 0 warnings | 0 notes