Merge pull request #128 from carriedaymont/main

Update upd-v2 with main changes

.Rbuildignore

@@ -17,3 +17,4 @@ Dockerfile
 cran-comments.md
 ^LICENSE\.md$
 ^vignettes$
+.DS_Store

.github/workflows/build-and-publish-image-latest.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.5.0
+      - uses: actions/checkout@v3
 
       - name: Build and publish Docker image
-        uses: VaultVulp/gp-docker-action@1.5.0
+        uses: VaultVulp/gp-docker-action@1.6.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           image-name: gcr-image

.github/workflows/build-and-publish-image-tag.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.5.0
+      - uses: actions/checkout@v3
 
       - name: Build and publish Docker image
-        uses: VaultVulp/gp-docker-action@1.5.0
+        uses: VaultVulp/gp-docker-action@1.6.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           image-name: gcr-image

Dockerfile

@@ -13,7 +13,7 @@ RUN mkdir /app/R_libs
 RUN echo "R_LIBS_USER=/app/R_libs" > /home/gcuser/.Renviron
 RUN echo ".libPaths(c('/app/R_libs', .libPaths()))" > /home/gcuser/.Rprofile
 
-RUN R -e "install.packages('growthcleanr', dependencies = TRUE, lib='/app/R_libs')"
+RUN R -e "devtools::install_github('mitre/growthcleanr', dependencies = TRUE, ref = 'main', lib = '/app/R_libs')"
 
 ADD exec/gcdriver.R /usr/local/bin/
 RUN chmod ugo+rx /usr/local/bin/gcdriver.R

NEWS.md

@@ -8,7 +8,9 @@
 ## Changed
 
 - Updated `ext_bmiz()` to match Dec 2022 NCHS guidelines (#98)
-- New options to keep dates, columns, unmateched rows in `longwide()` (#71)
+- New options to keep dates, columns, unmatched rows in `longwide()` (#71)
+- Updated CITATION to match new CRAN requirements
+- Updated Dockerfile to build from repo, not CRAN
 
 # growthcleanr 2.0.3 - 2022-11-01
 

cran-comments.md

@@ -6,9 +6,29 @@ There were no ERRORs, WARNINGs, or NOTEs.
 ## Downstream dependencies
 There are currently no downstream dependencies for this package.
 
+## CRAN manual test
+
+We have addressed each of the notes in the manual test as below:
+
+* Package CITATION file contains call(s) to old-style personList() or
+   as.personList().  Please use c() on person objects instead.
+   Package CITATION file contains call(s) to old-style citEntry() or
+   citHeader()/citFooter().  Please use bibentry() instead, possibly with
+   arguments 'header' and 'footer'.
+
+
+We have updated the citation accordingly.
 
 # Previous Submissions
 
+# CRAN submission growthcleanr 2.1.0 (1)
+
+## R CMD check results
+There were no ERRORs, WARNINGs, or NOTEs.
+
+## Downstream dependencies
+There are currently no downstream dependencies for this package.
+
 # CRAN submission growthcleanr 2.0.3
 
 ## R CMD check results

inst/CITATION

@@ -1,14 +1,12 @@
-citHeader("To cite growthcleanr in publications use:")
-
-citEntry(entry = "Article",
+bibentry(bibtype = "Article",
   title        = "Automated identification of implausible values in growth data from pediatric electronic health records",
-  author       = personList(
-                  as.person("Carrie Daymont"),
-                  as.person("Michelle E Ross"),
+  author       = c(
+                  person("Carrie Daymont"),
+                  person("Michelle E Ross"),
                   person(given="A", family = "Russell Localio"),
-                  as.person("Alexander G Fiks"),
-                  as.person("Richard C Wasserman"),
-                  as.person("Robert W Grundmeier")),
+                  person("Alexander G Fiks"),
+                  person("Richard C Wasserman"),
+                  person("Robert W Grundmeier")),
   journal      = "Journal of the American Medical Informatics Association",
   year         = "2017",
   doi = "10.1093/jamia/ocx037",
@@ -22,4 +20,4 @@ citEntry(entry = "Article",
 
   textVersion  =
   paste("Carrie Daymont, Michelle E Ross, A Russell Localio, Alexander G Fiks, Richard C Wasserman, Robert W Grundmeier, Automated identification of implausible values in growth data from pediatric electronic health records, Journal of the American Medical Informatics Association, Volume 24, Issue 6, November 2017, Pages 1080–1087, https://doi.org/10.1093/jamia/ocx037")
-)
+)