Merge pull request #2 from hadley/dev-stringr

Fixes for dev stringr
hope-data-science · Sep 22, 2024 · f54db0f · f54db0f
2 parents 5f6b4e5 + 05b4d8a
commit f54db0f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 27 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -0,0 +1,8 @@
+^.*\.Rproj$
+^\.Rproj\.user$
+^LICENSE\.md$
+^cran-comments\.md$
+^pkgdown$
+^dev\.R$
+^docs$
+^performance\.png$
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+.Rproj.user
+.Rhistory
+.RData
+.Ruserdata
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -16,8 +16,7 @@ URL: https://github.com/hope-data-science/tidyft, https://hope-data-science.gith
 BugReports: https://github.com/hope-data-science/tidyft/issues
 License: MIT + file LICENSE
 Encoding: UTF-8
-LazyData: true
-RoxygenNote: 7.1.0
+RoxygenNote: 7.2.1
 Imports: 
     data.table (>= 1.12.8),
     stringr (>= 1.4.0),
@@ -26,5 +25,6 @@ Suggests:
     knitr,
     rmarkdown,
     profvis,
-    dplyr
+    dplyr,
+    dtplyr
 VignetteBuilder: knitr
diff --git a/man/reexports.Rd b/man/reexports.Rd
diff --git a/man/unite.Rd b/man/unite.Rd
diff --git a/tidyft.Rproj b/tidyft.Rproj
@@ -1,21 +1,22 @@
-Version: 1.0
-
-RestoreWorkspace: No
-SaveWorkspace: No
-AlwaysSaveHistory: Default
-
-EnableCodeIndexing: Yes
-UseSpacesForTab: Yes
-NumSpacesForTab: 2
-Encoding: UTF-8
-
-RnwWeave: Sweave
-LaTeX: pdfLaTeX
-
-AutoAppendNewline: Yes
-StripTrailingWhitespace: Yes
-
-BuildType: Package
-PackageUseDevtools: Yes
-PackageInstallArgs: --no-multiarch --with-keep.source
-PackageRoxygenize: rd,collate,namespace
+Version: 1.0
+
+RestoreWorkspace: No
+SaveWorkspace: No
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
+
+AutoAppendNewline: Yes
+StripTrailingWhitespace: Yes
+LineEndingConversion: None
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source
+PackageRoxygenize: rd,collate,namespace