Merge branch 'main' into assert_count_true

# Conflicts:
#	.gitignore

.Rbuildignore

@@ -25,3 +25,5 @@ Index.Rmd
 ^_pkgdown\.yml$
 ^pkgdown$
 ^\.github$
+revdep/
+^CRAN-SUBMISSION$

.gitignore

@@ -2,12 +2,9 @@
 .Rhistory
 .RData
 *.docx
-
-
 ~WRL0005\.tmp
 doc
 docs
 Meta
 docs/
 janitor.Rproj
-inst/doc

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: janitor
 Title: Simple Tools for Examining and Cleaning Dirty Data
-Version: 2.2.0.9000
+Version: 2.2.1.9000
 Authors@R: c(
     person("Sam", "Firke", , "[email protected]", role = c("aut", "cre")),
     person("Bill", "Denney", , "[email protected]", role = "ctb"),

NEWS.md

@@ -1,4 +1,4 @@
-# janitor 2.2.0.9000 - unreleased development version
+# janitor 2.2.1.9000 - unreleased development version
 
 ## Breaking changes
 
@@ -8,8 +8,6 @@ These are all minor breaking changes resulting from enhancements and are not exp
 
 * When `tabyl()` is called on a data.frame containing labels, it now displays the label attribute as the name of the first column in the the resulting `tabyl` object (@olivroy, #394). This may break subsequent code that refers to the output of such a `tabyl` by column name. To maintain the previous behavior of ignoring variable labels, you can remove the labels with a function like `haven::zap_labels()` or `labelled::remove_labels()` before calling `tabyl()`.
 
-* `sas_numeric_to_date()` now warns for timezones other than "UTC" due to the way that SAS loads timezones, and the default timezone for `sas_numeric_to_date()` is now "UTC" instead of "" (#583, @billdenney)
-
 ## New features
 
 * A new function `paste_skip_na()` pastes without including NA values (#537).
@@ -35,6 +33,14 @@ These are all minor breaking changes resulting from enhancements and are not exp
 
 * Restyle the package and vignettes according to the [tidyverse style guide](https://style.tidyverse.org) (#548, @olivroy)
 
+# janitor 2.2.1 (2024-12-22)
+
+This is a trivial bugfix release whose only purpose is fixing a test that was failing on CRAN due to the way timezones are handled in Debian. In making that fix (PR #584), we made a small - technically breaking - improvement to a function that works with SAS dates. >99.9% of janitor users should be unaffected by this release.
+
+## Breaking changes
+
+* `sas_numeric_to_date()` now warns for timezones other than "UTC" due to the way that SAS loads timezones, and the default timezone for `sas_numeric_to_date()` is now "UTC" instead of "" (#583, @billdenney)
+
 # janitor 2.2.0 (2023-02-02)
 
 ## Breaking changes

cran-comments.md

@@ -1,34 +1,23 @@
 # Submission
-2023-02-01
+2024-12-22
 
 ## Submission summary
 
-*Resubmitting as 2.2.0 again with fixes to URLs in documentation*
-
-### janitor version 2.2.0
-An accumulation of enhancements and bug fixes.  Breaking changes only for edge cases.
-
-Notably, this fixes the current test failures on CRAN for this package, resulting from
-changes introduced in the latest version of the dplyr package.
+### janitor version 2.2.1
+Contains only trivial changes needed to address failing test on CRAN, specific to how timezones are handled in Debian. 
 
 ### Test environments
 
 #### Windows
-* Windows 10 with R-release 4.2.2 (local)
-* Windows Server 2022 x64 (build 20348) with R Under development (unstable) (2023-01-31 r83741 ucrt) via win-builder, checked 2023-02-01
+* Windows Server 2022 x64 (build 20348) with R Under development (unstable) (2024-12-20 r87452 ucrt) via win-builder, checked 2024-12-21
 
 #### Linux
-* ubuntu 22.04 R-release 4.2.2 (Github CI)
-* ubuntu 22.04 R-devel R Under development (unstable) (2023-02-01) (Github CI)
-* ubuntu 22.04 R-oldrel 4.1.3 (Github CI)
-
-#### Mac
-* Mac OS 12.6.2 with R-release 4.2.2 (Github CI)
+* Ubuntu 24.04 R-version 4.3.3 (2024-02-29) (local)
 
 ### R CMD check results
 0 errors | 0 warnings | 0 notes
 
 ### Downstream dependencies
 This does not negatively affect downstream dependencies.
 
-revdepcheck passed for 101 of 101 packages (98 from CRAN, 3 from bioconductor).
+revdepcheck passed for 124 of 125 packages. I investigated package BFS and the erroring function and found no use of janitor's functions so believe this to be a false positive.

tests/testthat/test-adorn-totals.R

@@ -346,7 +346,7 @@ test_that("supplying NA to fill preserves column types", {
     a = c("hi", "low", "med"),
     b = factor(c("big", "small", "regular")),
     c = c(as.Date("2000-01-01"), as.Date("2000-01-02"), as.Date("2000-01-03")),
-    d = c(as.POSIXct("2000-01-01", tz = "ROK"), as.POSIXct("2000-01-02"), as.POSIXct("2000-01-03")),
+    d = c(as.POSIXct("2000-01-01", tz = "UTC"), as.POSIXct("2000-01-02"), as.POSIXct("2000-01-03")),
     e = 1:3,
     f = 4:6,
     g = c(TRUE, FALSE, TRUE),