Merge branch 'main' into devel

ropensci · Jan 23, 2024 · 3828d47 · 3828d47
2 parents 398c1e1 + aff35aa
commit 3828d47
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 45 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: excluder
 Title: Checks for Exclusion Criteria in Online Data
-Version: 0.5.0
+Version: 0.5.1
 Authors@R: c(
     person("Jeffrey R.", "Stevens", , "[email protected]", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0003-2375-1360")),
@@ -17,9 +17,9 @@ License: GPL (>= 3)
 URL: https://docs.ropensci.org/excluder/,
     https://github.com/ropensci/excluder/
 BugReports: https://github.com/ropensci/excluder/issues/
-Depends: 
+Depends:
     R (>= 3.5.0)
-Imports: 
+Imports:
     cli,
     curl,
     dplyr,
@@ -32,15 +32,15 @@ Imports:
     stringr,
     tidyr,
     tidyselect
-Suggests: 
+Suggests:
     covr,
     knitr,
     lifecycle,
     readr,
     rmarkdown,
     testthat (>= 3.0.0),
     withr
-VignetteBuilder: 
+VignetteBuilder:
     knitr
 Config/testthat/edition: 3
 Encoding: UTF-8

diff --git a/NEWS.md b/NEWS.md
@@ -1,27 +1,49 @@
-# excluder 0.5.0
+# excluder 0.5.1 (2024-01-13)
+
+### NEW FEATURES
+
+* Added new `qualtrics_fetch2` dataset that includes labels as column names.
+
+### PACKAGE DEVELOPMENT
+
+* The {tidyselect} package has deprecated using the `.data` pronoun in tidy selections. So `.data` is no longer used in `select()` or other selection functions.
+* We used the `usethis::use_tidy_description()` to tidy up DESCRIPTION file.
+
+### BUG FIXES
+
+* Fixed bug to now reassign column names when `rename = TRUE`.
+
+### DOCUMENTATION UPDATES
+
+* We have switched from the {devtools} to the {remotes} version of `install_github()` in the README to reduce dependencies.
+* Because the {iptools} package has been removed from CRAN, the links to {iptools} functions now refer to the GitHub site.
+
+
+# excluder 0.5.0 (2023-02-13)
 
 ### PACKAGE DEVELOPMENT
 
 * The `{iptools}` package has been replaced with the [`{ipaddress}`](https://github.com/davidchall/ipaddress) package.
 
-## DOCUMENTATION UPDATES
+### DOCUMENTATION UPDATES
 
 * The _Getting started_ vignette has been renamed _excluder_.
 * The data sets have been added to the References page.
 
-# excluder 0.4.0
 
-## NEW FEATURES
+# excluder 0.4.0 (2022-06-22)
+
+### NEW FEATURES
 
 * The `use_labels()` function extracts the Qualtrics question labels included when importing with `qualtRics::fetch_survey()` and renames the column names with these labels.
 * The `qualtrics_fetch` data set offers an example data set that is imported using the `qualtRics::fetch_survey()` function.
 * The `rename_columns()` function renames the columns to match standard Qualtrics column names. This is primarily a utility function for the `mark_*()` functions but may be useful to users in some circumstances.
 
-## MINOR IMPROVEMENTS
+### MINOR IMPROVEMENTS
 
 * For excluding based on screen resolution, previously you had to provide a minimum width or height. This works fine if all screens are in the same orientation, but if screens differ in their orientation, this isn't sufficient. Now there is an overall minimum argument `res_min` that will apply to both width and height. That is, now you can test if at least one of the dimensions has a resolution greater than `res_min`. (#9)
 
-## DOCUMENTATION UPDATES
+### DOCUMENTATION UPDATES
 
 * To use several of the exclusion criteria, you must collect non-anonymized data and/or computer metadata. The documentation now points to the Qualtrics documentation about non-anonymized data and computer metadata.
 
@@ -32,17 +54,17 @@
 * Tests for helper functions have been improved.
 
 
-# excluder 0.3.3
+# excluder 0.3.3 (2021-12-03)
 
-## BUG FIXES
+### BUG FIXES
 
 * Updating `{dplyr}` to 1.0.8 caught problem with using `across()` inside `is.na()`. Instead, it now uses `if_all()` with `is.na()` as argument. Thanks to [@romainfrancois](https://github.com/romainfrancois) for pull request [\#7](https://github.com/ropensci/excluder/pull/7).
 * `remove_label_rows()` now properly converts numeric data in Status and Finished columns.
 
 
-# excluder 0.3.2
+# excluder 0.3.2 (2021-11-10)
 
-## MINOR IMPROVEMENTS
+### MINOR IMPROVEMENTS
 
 * The `remove_label_rows()` function can now rename columns to match the default column names used in all of the verb function arguments.
 * The `mark_ip_()` function now checks for (1) internet connectivity, (2) whether the IP address data can be downloaded from https://www.iwik.org/ipcountry/, and (3) if the country code is valid. The function fails gracefully if any of these are not met.
@@ -59,7 +81,7 @@
 * Clean up package in preparation for submission to CRAN.
 
 
-# excluder 0.3.1
+# excluder 0.3.1 (2021-11-04)
 
 ### MINOR IMPROVEMENTS
 
@@ -79,7 +101,7 @@
 * The `{excluder}` package has now been approved by and transferred to [rOpenSci](https://ropensci.org/). The package was peer reviewed by Joseph O'Brien ([@jmobrien](https://github.com/jmobrien)) and Julia Silge ([@juliasilge](https://github.com/juliasilge)), who are now listed as reviewers in the DESCRIPTION file.
 
 
-# excluder 0.3.0
+# excluder 0.3.0 (2021-10-13)
 
 ### NEW FEATURES
 

diff --git a/codemeta.json b/codemeta.json
@@ -4,17 +4,17 @@
   "identifier": "excluder",
   "description": "Data that are collected through online sources such as Mechanical Turk may require excluding rows because of IP address duplication, geolocation, or completion duration. This package facilitates exclusion of these data for Qualtrics datasets.",
   "name": "excluder: Checks for Exclusion Criteria in Online Data",
-  "relatedLink": "https://docs.ropensci.org/excluder/",
+  "relatedLink": ["https://docs.ropensci.org/excluder/", "https://CRAN.R-project.org/package=excluder"],
   "codeRepository": "https://github.com/ropensci/excluder/",
   "issueTracker": "https://github.com/ropensci/excluder/issues/",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.2.2 Patched (2022-11-10 r83330)",
+  "runtimePlatform": "R version 4.3.2 (2023-10-31)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -137,6 +137,12 @@
   ],
   "softwareRequirements": {
     "1": {
+      "@type": "SoftwareApplication",
+      "identifier": "R",
+      "name": "R",
+      "version": ">= 3.5.0"
+    },
+    "2": {
       "@type": "SoftwareApplication",
       "identifier": "cli",
       "name": "cli",
@@ -148,7 +154,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=cli"
     },
-    "2": {
+    "3": {
       "@type": "SoftwareApplication",
       "identifier": "curl",
       "name": "curl",
@@ -160,7 +166,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=curl"
     },
-    "3": {
+    "4": {
       "@type": "SoftwareApplication",
       "identifier": "dplyr",
       "name": "dplyr",
@@ -172,7 +178,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=dplyr"
     },
-    "4": {
+    "5": {
       "@type": "SoftwareApplication",
       "identifier": "ipaddress",
       "name": "ipaddress",
@@ -184,7 +190,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=ipaddress"
     },
-    "5": {
+    "6": {
       "@type": "SoftwareApplication",
       "identifier": "janitor",
       "name": "janitor",
@@ -196,7 +202,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=janitor"
     },
-    "6": {
+    "7": {
       "@type": "SoftwareApplication",
       "identifier": "lubridate",
       "name": "lubridate",
@@ -208,7 +214,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=lubridate"
     },
-    "7": {
+    "8": {
       "@type": "SoftwareApplication",
       "identifier": "magrittr",
       "name": "magrittr",
@@ -220,7 +226,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=magrittr"
     },
-    "8": {
+    "9": {
       "@type": "SoftwareApplication",
       "identifier": "maps",
       "name": "maps",
@@ -232,7 +238,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=maps"
     },
-    "9": {
+    "10": {
       "@type": "SoftwareApplication",
       "identifier": "rlang",
       "name": "rlang",
@@ -244,7 +250,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=rlang"
     },
-    "10": {
+    "11": {
       "@type": "SoftwareApplication",
       "identifier": "stringr",
       "name": "stringr",
@@ -256,7 +262,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=stringr"
     },
-    "11": {
+    "12": {
       "@type": "SoftwareApplication",
       "identifier": "tidyr",
       "name": "tidyr",
@@ -268,7 +274,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=tidyr"
     },
-    "12": {
+    "13": {
       "@type": "SoftwareApplication",
       "identifier": "tidyselect",
       "name": "tidyselect",
@@ -280,15 +286,9 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=tidyselect"
     },
-    "13": {
-      "@type": "SoftwareApplication",
-      "identifier": "R",
-      "name": "R",
-      "version": ">= 3.5.0"
-    },
     "SystemRequirements": null
   },
-  "fileSize": "335.041KB",
+  "fileSize": "360.275KB",
   "citation": [
     {
       "@type": "ScholarlyArticle",
@@ -317,5 +317,15 @@
         }
       }
     }
-  ]
+  ],
+  "releaseNotes": "https://github.com/ropensci/excluder/blob/master/NEWS.md",
+  "readme": "https://github.com/ropensci/excluder/blob/main/README.md",
+  "contIntegration": ["https://github.com/ropensci/excluder/actions", "https://app.codecov.io/gh/jeffreyrstevens/excluder?branch=main"],
+  "developmentStatus": ["https://www.repostatus.org/#active", "https://lifecycle.r-lib.org/articles/stages.html#stable"],
+  "review": {
+    "@type": "Review",
+    "url": "https://github.com/ropensci/software-review/issues/455",
+    "provider": "https://ropensci.org"
+  },
+  "keywords": ["qualtrics", "mturk", "datacleaning", "exclusion", "r", "rstats", "r-package"]
 }
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,9 +1,3 @@
-## Resubmission
-This is a resubmission. In this version I have:
-
-* Update the CITATION style replacing personList() with c() and citEntry() with bibentry()
-
-* Removed the 'rstudio' file
 
 ## R CMD check results
 There were no ERRORs or WARNINGs.