Move extract_schema_version to hubUtils

hubverse-org · May 15, 2024 · d9a1c81 · d9a1c81
1 parent 8458223
commit d9a1c81
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 40 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -44,7 +44,7 @@ Suggests:
     testthat (>= 3.2.0)
 Remotes:
     Infectious-Disease-Modeling-Hubs/hubData,
-    Infectious-Disease-Modeling-Hubs/hubUtils
+    Infectious-Disease-Modeling-Hubs/hubUtils@enhancement/v3-utils
 Config/Needs/website: Infectious-Disease-Modeling-Hubs/hubStyle
 Depends: 
     R (>= 2.10)

diff --git a/NAMESPACE b/NAMESPACE
@@ -17,7 +17,6 @@ export(create_target_metadata)
 export(create_target_metadata_item)
 export(create_task_id)
 export(create_task_ids)
-export(extract_schema_version)
 export(validate_config)
 export(validate_hub_config)
 export(validate_model_metadata_schema)

diff --git a/R/config-schema-utils.R b/R/config-schema-utils.R
@@ -9,7 +9,7 @@ get_config_file_schema_version <- function(config_path, config) {
     config = config
   )
 
-  version <- extract_schema_version(config_schema_version)
+  version <- hubUtils::extract_schema_version(config_schema_version)
 
   if (length(version) == 0L) {
     cli::cli_abort(

diff --git a/R/create_output_type_item.R b/R/create_output_type_item.R
@@ -267,7 +267,7 @@ create_output_type_sample <- function(is_required, output_type_id_type, max_leng
 
   schema <- download_tasks_schema(schema_version, branch)
 
-  if (extract_schema_version(schema$`$id`) < "v3.0.0") {
+  if (hubUtils::extract_schema_version(schema$`$id`) < "v3.0.0") {
     cli::cli_abort(
       "This function is only supported for schema versions {.val v3.0.0} and above."
     )

diff --git a/R/utils.R b/R/utils.R
diff --git a/man/extract_schema_version.Rd b/man/extract_schema_version.Rd
diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R