Merge branch 'devel' of github.com:LieberInstitute/slurmjobs into devel

LieberInstitute · Sep 20, 2024 · 32f35ea · 32f35ea
2 parents bf58164 + 74fc163
commit 32f35ea
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -4,3 +4,5 @@
 ^\.github$
 ^codecov\.yml$
 ^data-raw$
+^.*\.Rproj$
+^\.Rproj\.user$
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 inst/doc
 dev/interactive_testing/logs
+.Rproj.user
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -14,7 +14,7 @@ URL: https://github.com/LieberInstitute/slurmjobs
 BugReports: https://support.bioconductor.org/tag/slurmjobs
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 Suggests: 
     BiocStyle,
     knitr,

diff --git a/R/job_single.R b/R/job_single.R
@@ -21,7 +21,7 @@
 #' your job will request is `cores` multiplied by `memory`.
 #' @param time_limit character(1): time limit specified in a format accepted by
 #' the \code{--time} parameter to \code{sbatch} (e.g. "4:00:00"). Defaults to 1
-#' day, following the JHPCE default (https://jhpce.jhu.edu/knowledge-base/setting-a-time-limit-for-your-slurm-job-on-jhpce/).
+#' day, following the JHPCE default (<https://jhpce.jhu.edu/slurm/time-limits/>).
 #' @param email The email reporting option for the email address ("BEGIN",
 #' "END", "FAIL", or "ALL")
 #' @param logdir The directory to contain the log, as an absolute or relative

diff --git a/man/job_single.Rd b/man/job_single.Rd
diff --git a/slurmjobs.Rproj b/slurmjobs.Rproj
@@ -0,0 +1,21 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 4
+Encoding: UTF-8
+
+RnwWeave: knitr
+LaTeX: pdfLaTeX
+
+AutoAppendNewline: Yes
+StripTrailingWhitespace: Yes
+LineEndingConversion: Posix
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source