Merge branch 'reporting' into dev

shug0131 · Jan 13, 2025 · 8870945 · 8870945
2 parents 90db7dc + 30ffb5c
commit 8870945
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 1.0.0
-Date: 2024-03-14 14:27:52 UTC
-SHA: 2842a2968d67bbc76287cc5cb59432332cc5f061
+Version: 1.0.1
+Date: 2024-08-07 12:17:08 UTC
+SHA: 1bce974b33d271f6f490cac80f6c6257e9edf904
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: eudract
 Type: Package
 Title: Creates Safety Results Summary in XML to Upload to EudraCT, or ClinicalTrials.gov
-Date: 2024-11-28
-Version: 1.0.2.9000
+Date: 2025-01-13
+Version: 1.0.2
 Authors@R: c(
     person("Simon", "Bond", email="[email protected]", role="cre"),
     person("Beatrice","Pantaleo", email="[email protected]", role="aut"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,8 @@
-# Placeholder for next version
-
-
 # eudract 1.0.2
 
-Update to print.summary_statistics() on how options() reset is delivered. To fix errors on CRAN checks
+Evading a windows bug whereby a call to xml2::xml_validate() crashes the system. 
+The checks are not run if the OS is windows. 
+
 
 # eudract 1.0.1
 

diff --git a/R/clintrials_gov_convert.R b/R/clintrials_gov_convert.R
@@ -60,9 +60,9 @@ clintrials_gov_convert <- function(input, original, output,
 
   message(paste0("'",output, "' is created or modified\n"))
   #check against the output schema
-  check_out <- xml2::xml_validate(safety, schema_results)
+  check_out <- ( Sys.info()["sysname"]=="Windows") || xml2::xml_validate(safety, schema_results)
   if( !check_out){ warning(attr(check_out,"errors"))}
-  check_out <- xml2::xml_validate(original, schema_output)
+  check_out <-  xml2::xml_validate(original, schema_output)
   if( !check_out){ warning(attr(check_out,"errors"))}
 
   message("Please email [email protected] to tell us if you have successfully uploaded a study to ClinicalTrials.gov .\nThis is to allow us to measure the impact of this tool.")

diff --git a/R/eudract_convert.R b/R/eudract_convert.R
@@ -29,7 +29,7 @@ eudract_convert <- function(input, output,
   xml2::write_xml(output_xml, output)
   message(paste0("'",output, "' is created or modified\n"))
   #check against the output schema
-  check_out <- xml2::xml_validate(output_xml, schema_output)
+  check_out <- ( Sys.info()["sysname"]=="Windows") || xml2::xml_validate(output_xml, schema_output)
   if( !check_out){ warning(attr(check_out,"errors"))}
   message("Please email [email protected] to tell us if you have successfully uploaded a study to EudraCT.\nThis is to allow us to measure the impact of this tool.")
   invisible(check_out)

diff --git a/build_dashboard.R b/build_dashboard.R
@@ -4,7 +4,8 @@ devtools::load_all()
 
 ?devtools::build_vignettes(clean=FALSE)
 devtools::clean_vignettes()
-devtools::check()
+devtoolss::install_deps(dependencies=TRUE)
+devtools::check(remote=TRUE, manual=TRUE)
 
 
 #.libPaths("U:/My Documents/R/win-library/4.1")

diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf