use devel roxygen2

r-lib · Jan 22, 2024 · ca2c47e · ca2c47e
1 parent 8931bc7
commit ca2c47e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/.github/workflows/repo-meta-tests.yaml b/.github/workflows/repo-meta-tests.yaml
@@ -24,7 +24,7 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |
-            any::roxygen2
+            r-lib/roxygen2
 
       - name: Ensure lint metadata is tested
         run: |

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -56,7 +56,7 @@ Config/Needs/development: pkgload, cli, testthat, patrick
 Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.0
+RoxygenNote: 7.3.0.9000
 Collate:
     'make_linter_from_xpath.R'
     'xp_utils.R'

diff --git a/NAMESPACE b/NAMESPACE
@@ -6,8 +6,6 @@ if (getRversion() >= "4.0.0") {
 } else {
   importFrom(backports, R_user_dir)
 }
-  importFrom(backports, R_user_dir)
-  importFrom(tools, R_user_dir)
 S3method("[",lints)
 S3method(as.data.frame,lints)
 S3method(format,lint)
@@ -173,7 +171,6 @@ export(with_id)
 export(xml_nodes_to_lints)
 export(xp_call_name)
 export(yoda_test_linter)
-if (getRversion() >= "4.0.0") {
 importFrom(cyclocomp,cyclocomp)
 importFrom(glue,glue)
 importFrom(glue,glue_collapse)
@@ -202,5 +199,3 @@ importFrom(xml2,xml_find_lgl)
 importFrom(xml2,xml_find_num)
 importFrom(xml2,xml_name)
 importFrom(xml2,xml_text)
-}
-} else {