refactor: minor updates

elipousson · Apr 29, 2023 · 47ab9d5 · 47ab9d5
1 parent abe316a
commit 47ab9d5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 41 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -25,7 +25,7 @@ Imports:
     lifecycle,
     purrr,
     rlang (>= 1.1.0),
-    sf,
+    sf (>= 1.0-11),
     tibble,
     units,
     vctrs

diff --git a/NAMESPACE b/NAMESPACE
@@ -126,7 +126,7 @@ export(st_center)
 export(st_circle)
 export(st_circumscribed_circle)
 export(st_clip)
-export(st_concave_hull)
+export(st_concave_hull_ext)
 export(st_distance_ext)
 export(st_donut)
 export(st_edge)
@@ -213,29 +213,22 @@ importFrom(lifecycle,deprecated)
 importFrom(lifecycle,signal_stage)
 importFrom(purrr,map_dfr)
 importFrom(rlang,.data)
-importFrom(rlang,.env)
-importFrom(rlang,`%||%`)
 importFrom(rlang,arg_match)
 importFrom(rlang,as_function)
 importFrom(rlang,caller_env)
 importFrom(rlang,check_installed)
 importFrom(rlang,check_required)
 importFrom(rlang,current_env)
-importFrom(rlang,env_get_list)
 importFrom(rlang,exec)
 importFrom(rlang,fn_fmls)
-importFrom(rlang,global_env)
 importFrom(rlang,has_length)
 importFrom(rlang,has_name)
-importFrom(rlang,is_false)
 importFrom(rlang,is_function)
 importFrom(rlang,is_interactive)
 importFrom(rlang,is_lambda)
-importFrom(rlang,is_logical)
 importFrom(rlang,is_missing)
 importFrom(rlang,is_named)
 importFrom(rlang,is_null)
-importFrom(rlang,is_true)
 importFrom(rlang,list2)
 importFrom(rlang,set_names)
 importFrom(rlang,try_fetch)
@@ -251,6 +244,7 @@ importFrom(sf,st_buffer)
 importFrom(sf,st_cast)
 importFrom(sf,st_centroid)
 importFrom(sf,st_combine)
+importFrom(sf,st_concave_hull)
 importFrom(sf,st_convex_hull)
 importFrom(sf,st_coordinates)
 importFrom(sf,st_crop)

diff --git a/R/import-standalone-obj-type.R b/R/import-standalone-obj-type.R
@@ -5,13 +5,16 @@
 # ---
 # repo: r-lib/rlang
 # file: standalone-obj-type.R
-# last-updated: 2022-10-04
+# last-updated: 2023-03-30
 # license: https://unlicense.org
 # imports: rlang (>= 1.1.0)
 # ---
 #
 # ## Changelog
 #
+# 2023-03-30:
+# - `stop_input_type()` now handles `I()` input literally in `arg`.
+#
 # 2022-10-04:
 # - `obj_type_friendly(value = TRUE)` now shows numeric scalars
 #   literally.
@@ -315,10 +318,15 @@ stop_input_type <- function(x,
   if (length(what)) {
     what <- oxford_comma(what)
   }
+  if (inherits(arg, "AsIs")) {
+    format_arg <- identity
+  } else {
+    format_arg <- cli$format_arg
+  }
 
   message <- sprintf(
     "%s must be %s, not %s.",
-    cli$format_arg(arg),
+    format_arg(arg),
     what,
     obj_type_friendly(x, value = show_value)
   )

diff --git a/R/sfext-package.R b/R/sfext-package.R
@@ -4,20 +4,6 @@
 ## usethis namespace: start
 #'
 #' @import rlang
-#' @importFrom rlang .data
-#' @importFrom rlang .env
-#' @importFrom rlang `%||%`
-#' @importFrom rlang caller_env
-#' @importFrom rlang global_env
-#' @importFrom rlang has_length
-#' @importFrom rlang is_interactive
-#' @importFrom rlang check_installed
-#' @importFrom rlang exec
-#' @importFrom rlang env_get_list
-#' @importFrom rlang is_true
-#' @importFrom rlang is_false
-#' @importFrom rlang is_null
-#' @importFrom rlang is_logical
 #' @importFrom cli cli_abort
 #' @importFrom cli cli_inform
 #' @importFrom cli cli_warn

diff --git a/R/usethis-cli.R b/R/usethis-cli.R
diff --git a/codemeta.json b/codemeta.json
@@ -8,13 +8,13 @@
   "codeRepository": "https://github.com/elipousson/sfext",
   "issueTracker": "https://github.com/elipousson/sfext/issues",
   "license": "https://spdx.org/licenses/MIT",
-  "version": "0.1.0.9000",
+  "version": "0.1.1",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.2.0 Patched (2022-05-23 r82396)",
+  "runtimePlatform": "R version 4.2.3 (2023-03-15)",
   "author": [
     {
       "@type": "Person",
@@ -43,18 +43,6 @@
     }
   ],
   "softwareSuggestions": [
-    {
-      "@type": "SoftwareApplication",
-      "identifier": "concaveman",
-      "name": "concaveman",
-      "provider": {
-        "@id": "https://cran.r-project.org",
-        "@type": "Organization",
-        "name": "Comprehensive R Archive Network (CRAN)",
-        "url": "https://cran.r-project.org"
-      },
-      "sameAs": "https://CRAN.R-project.org/package=concaveman"
-    },
     {
       "@type": "SoftwareApplication",
       "identifier": "covr",
@@ -346,7 +334,7 @@
       "@type": "SoftwareApplication",
       "identifier": "filenamr",
       "name": "filenamr",
-      "version": ">= 0.1.0.9000",
+      "version": ">= 0.1.0.9002",
       "sameAs": "https://github.com/elipousson/filenamr"
     },
     "6": {
@@ -414,6 +402,7 @@
       "@type": "SoftwareApplication",
       "identifier": "sf",
       "name": "sf",
+      "version": ">= 1.0-11",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
@@ -460,7 +449,7 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "848.361KB",
+  "fileSize": "851.315KB",
   "releaseNotes": "https://github.com/elipousson/sfext/blob/master/NEWS.md",
   "readme": "https://github.com/elipousson/sfext/blob/main/README.md",
   "contIntegration": "https://app.codecov.io/gh/elipousson/sfext?branch=main",
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ Imports: @@
         lifecycle,
         purrr,
         rlang (>= 1.1.0),
-        sf,
+        sf (>= 1.0-11),
         tibble,
         units,
         vctrs
@@ Expand Down @@