From f8b7de996a99203d6683fab43e0fa56b5cbb9397 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:00:01 -0400 Subject: [PATCH 1/3] Fix urls (#41) --- DESCRIPTION | 2 +- R/catholic-dioceses.R | 2 +- R/early-colleges.R | 2 +- R/judges.R | 2 +- R/methodists.R | 2 +- R/naval-promotions.R | 6 +++--- R/paulists.R | 2 +- R/presbyterians.R | 4 ++-- R/quasi-war.R | 2 +- data-raw/scripts/federal-judges.R | 4 ++-- man/catholic_dioceses.Rd | 2 +- man/early_colleges.Rd | 2 +- man/judges.Rd | 2 +- man/methodists.Rd | 2 +- man/naval_promotions.Rd | 6 +++--- man/paulist_missions.Rd | 2 +- man/presbyterians.Rd | 4 ++-- man/quasi_war.Rd | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d4c95cf..9578830 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Suggests: ggplot2 (>= 3.0.0) License: MIT + file LICENSE LazyData: true -URL: https://docs.ropensci.org/historydata, https://github.com/ropensci/historydata +URL: https://docs.ropensci.org/historydata/, https://github.com/ropensci/historydata BugReports: https://github.com/ropensci/historydata/issues RoxygenNote: 7.3.2 Encoding: UTF-8 diff --git a/R/catholic-dioceses.R b/R/catholic-dioceses.R index 1202b74..1f93a07 100644 --- a/R/catholic-dioceses.R +++ b/R/catholic-dioceses.R @@ -30,7 +30,7 @@ #' (1789-1964)} (New York: Joseph F. Wagner, 1964), 425-26. #' #' For the United States since 1963, Canada, and Mexico: -#' \url{http://www.catholic-hierarchy.org/} +#' \url{https://www.catholic-hierarchy.org/} #' #' @examples #' head(catholic_dioceses) diff --git a/R/early-colleges.R b/R/early-colleges.R index 7140dda..8d06413 100644 --- a/R/early-colleges.R +++ b/R/early-colleges.R @@ -20,7 +20,7 @@ #' \code{secular} if not founded by a denomination. #' } #' @format A data frame with 65 observations of 6 variables. -#' @author \href{http://gmu.academia.edu/GeorgeOberle}{George Oberle}, George +#' @author \href{https://library.gmu.edu/faculty/george-oberle}{George Oberle}, George #' Mason University #' #' Daniel Walker Howe diff --git a/R/judges.R b/R/judges.R index 24bb9d3..79ecab6 100644 --- a/R/judges.R +++ b/R/judges.R @@ -18,7 +18,7 @@ #' #' @format Two data frames, \code{judges_people} and \code{judges_appointments}. #' @references This data is taken from the -#' \href{http://www.uscourts.gov/JudgesAndJudgeships/BiographicalDirectoryOfJudges.aspx}{Biographical +#' \href{https://www.uscourts.gov/sites/default/files/allauth.pdf}{Biographical #' Directory of Federal Judges, 1789-present}. #' @examples #' data(judges_people) diff --git a/R/methodists.R b/R/methodists.R index 76e13c6..e2ee838 100644 --- a/R/methodists.R +++ b/R/methodists.R @@ -4,7 +4,7 @@ #' annual meeting minutes of the Methodist Episcopal Church in the United States #' of America. #' -#' @author \href{http://lincolnmullen.com}{Lincoln Mullen}, George Mason +#' @author \href{https://lincolnmullen.com}{Lincoln Mullen}, George Mason #' University #' @format A data frame with 20241 observations of 11 variables. #' @references See the \code{url} field in each row for a link to the page in diff --git a/R/naval-promotions.R b/R/naval-promotions.R index ecf2bf0..784ed71 100644 --- a/R/naval-promotions.R +++ b/R/naval-promotions.R @@ -37,16 +37,16 @@ #' attained the associated rank. } #' #' @format A data frame with 5,705 observations of 4 variables. -#' @author \href{http://abbymullen.org/}{Abby Mullen}, Northeastern University +#' @author \href{https://abbymullen.org/}{Abby Mullen}, Northeastern University #' #' Edward W. Callahan #' @references This data was compiled by Abby Mullen from Edward W. Callahan, #' \emph{Officers of the Continental and U.S. Navy and Marine Corps, #' 1775-1900} (New York: L. R. Hamersly, 1901), made available via the Naval #' Historical Center, -#' \url{http://www.ibiblio.org/hyperwar/NHC/Callahan/index.htm}. See Mullen's +#' \url{https://www.ibiblio.org/hyperwar/NHC/Callahan/index.htm}. See Mullen's #' blog post about compiling the data, -#' "\href{http://abbymullen.org/database-of-officers-of-the-line/}{Database of +#' "\href{https://abbymullen.org/database-of-officers-of-the-line/}{Database of #' Officers of the Line}," abbymullen.org, January 5, 2013. #' @examples #' head(naval_promotions) diff --git a/R/paulists.R b/R/paulists.R index 5e9adf7..dbe0f8c 100644 --- a/R/paulists.R +++ b/R/paulists.R @@ -51,7 +51,7 @@ #' #' } #' -#' @author \href{http://lincolnmullen.com}{Lincoln Mullen}, George Mason +#' @author \href{https://lincolnmullen.com}{Lincoln Mullen}, George Mason #' University #' @format A data frame with 841 observations of 17 variables. #' @references The Paulist missions are recorded in \emph{Chronicle of the diff --git a/R/presbyterians.R b/R/presbyterians.R index 997106e..d6127db 100644 --- a/R/presbyterians.R +++ b/R/presbyterians.R @@ -18,11 +18,11 @@ #' received by confession varies in title, but has been presumed to refer to the #' same process. #' -#' @author \href{http://lincolnmullen.com}{Lincoln Mullen}, George Mason +#' @author \href{https://lincolnmullen.com}{Lincoln Mullen}, George Mason #' University #' @format A data frame with 133 observations of 37 variables. #' @references Weber, Herman C. \emph{Presbyterian Statistics Through One #' Hundred Year, 1826--1926: Tabulated, Visualized, and Interpreted}. #' Philadelphia: The General Council, Presbyterian Church in the U.S.A., 1927. -#' \url{http://catalog.hathitrust.org/Record/007109885}. +#' \url{https://catalog.hathitrust.org/Record/007109885}. "presbyterians" diff --git a/R/quasi-war.R b/R/quasi-war.R index f660ae2..b21a813 100644 --- a/R/quasi-war.R +++ b/R/quasi-war.R @@ -2,7 +2,7 @@ #' America #' #' @format A data frame with 198 observations of 16 variables. -#' @references This data was gathered by \href{http://abbymullen.org/}{Abby +#' @references This data was gathered by \href{https://abbymullen.org/}{Abby #' Mullen}. #' @examples #' head(quasi_war) diff --git a/data-raw/scripts/federal-judges.R b/data-raw/scripts/federal-judges.R index e34916b..678f438 100644 --- a/data-raw/scripts/federal-judges.R +++ b/data-raw/scripts/federal-judges.R @@ -1,12 +1,12 @@ # Biographical Directory of Federal Judges, 1789-present -# http://www.uscourts.gov/JudgesAndJudgeships/BiographicalDirectoryOfJudges.aspx) +# https://www.uscourts.gov/JudgesAndJudgeships/BiographicalDirectoryOfJudges.aspx) library(dplyr) library(tidyr) library(devtools) data_file <- file.path("data-raw", "judges.csv") -export_url <- "http://www.fjc.gov/history/export/jb.txt" +export_url <- "https://www.fjc.gov/history/export/jb.txt" download.file(export_url, destfile = data_file) judges <- read.csv(data_file, stringsAsFactors = FALSE) %>% diff --git a/man/catholic_dioceses.Rd b/man/catholic_dioceses.Rd index fbaf601..7cc4a72 100644 --- a/man/catholic_dioceses.Rd +++ b/man/catholic_dioceses.Rd @@ -45,6 +45,6 @@ This data is compiled from several sources: (1789-1964)} (New York: Joseph F. Wagner, 1964), 425-26. For the United States since 1963, Canada, and Mexico: - \url{http://www.catholic-hierarchy.org/} + \url{https://www.catholic-hierarchy.org/} } \keyword{datasets} diff --git a/man/early_colleges.Rd b/man/early_colleges.Rd index bd5095e..6cd5599 100644 --- a/man/early_colleges.Rd +++ b/man/early_colleges.Rd @@ -47,7 +47,7 @@ This data was transcribed by George Oberle from the table "Some 1815-1848} (New York: Oxford University Press, 2007), 460-461. } \author{ -\href{http://gmu.academia.edu/GeorgeOberle}{George Oberle}, George +\href{https://library.gmu.edu/faculty/george-oberle}{George Oberle}, George Mason University Daniel Walker Howe diff --git a/man/judges.Rd b/man/judges.Rd index fa1647f..7be50c5 100644 --- a/man/judges.Rd +++ b/man/judges.Rd @@ -33,6 +33,6 @@ data(judges_appointments) } \references{ This data is taken from the - \href{http://www.uscourts.gov/JudgesAndJudgeships/BiographicalDirectoryOfJudges.aspx}{Biographical + \href{https://www.uscourts.gov/sites/default/files/allauth.pdf}{Biographical Directory of Federal Judges, 1789-present}. } diff --git a/man/methodists.Rd b/man/methodists.Rd index 4e1cd68..50cd10b 100644 --- a/man/methodists.Rd +++ b/man/methodists.Rd @@ -20,7 +20,7 @@ See the \code{url} field in each row for a link to the page in the Hathi Trust from which that row was transcribed. } \author{ -\href{http://lincolnmullen.com}{Lincoln Mullen}, George Mason +\href{https://lincolnmullen.com}{Lincoln Mullen}, George Mason University } \keyword{datasets} diff --git a/man/naval_promotions.Rd b/man/naval_promotions.Rd index 4d6d33d..13d962c 100644 --- a/man/naval_promotions.Rd +++ b/man/naval_promotions.Rd @@ -57,13 +57,13 @@ This data was compiled by Abby Mullen from Edward W. Callahan, \emph{Officers of the Continental and U.S. Navy and Marine Corps, 1775-1900} (New York: L. R. Hamersly, 1901), made available via the Naval Historical Center, - \url{http://www.ibiblio.org/hyperwar/NHC/Callahan/index.htm}. See Mullen's + \url{https://www.ibiblio.org/hyperwar/NHC/Callahan/index.htm}. See Mullen's blog post about compiling the data, - "\href{http://abbymullen.org/database-of-officers-of-the-line/}{Database of + "\href{https://abbymullen.org/database-of-officers-of-the-line/}{Database of Officers of the Line}," abbymullen.org, January 5, 2013. } \author{ -\href{http://abbymullen.org/}{Abby Mullen}, Northeastern University +\href{https://abbymullen.org/}{Abby Mullen}, Northeastern University Edward W. Callahan } diff --git a/man/paulist_missions.Rd b/man/paulist_missions.Rd index ba2c219..7b4e482 100644 --- a/man/paulist_missions.Rd +++ b/man/paulist_missions.Rd @@ -75,7 +75,7 @@ The Paulist missions are recorded in \emph{Chronicle of the Mullen. } \author{ -\href{http://lincolnmullen.com}{Lincoln Mullen}, George Mason +\href{https://lincolnmullen.com}{Lincoln Mullen}, George Mason University } \keyword{datasets} diff --git a/man/presbyterians.Rd b/man/presbyterians.Rd index af9422a..2b28aa3 100644 --- a/man/presbyterians.Rd +++ b/man/presbyterians.Rd @@ -34,10 +34,10 @@ same process. Weber, Herman C. \emph{Presbyterian Statistics Through One Hundred Year, 1826--1926: Tabulated, Visualized, and Interpreted}. Philadelphia: The General Council, Presbyterian Church in the U.S.A., 1927. - \url{http://catalog.hathitrust.org/Record/007109885}. + \url{https://catalog.hathitrust.org/Record/007109885}. } \author{ -\href{http://lincolnmullen.com}{Lincoln Mullen}, George Mason +\href{https://lincolnmullen.com}{Lincoln Mullen}, George Mason University } \keyword{datasets} diff --git a/man/quasi_war.Rd b/man/quasi_war.Rd index c661cf7..d04ed34 100644 --- a/man/quasi_war.Rd +++ b/man/quasi_war.Rd @@ -19,7 +19,7 @@ America head(quasi_war) } \references{ -This data was gathered by \href{http://abbymullen.org/}{Abby +This data was gathered by \href{https://abbymullen.org/}{Abby Mullen}. } \keyword{datasets} From 5319e05ce38c64a15b7d050e118b40ec1d22fc33 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:42:51 -0400 Subject: [PATCH 2/3] Bump minor version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 9578830..bdd9b4f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: historydata Type: Package Title: Datasets for Historians -Version: 0.2.0.9003 +Version: 0.3.0 Authors@R: c(person("Lincoln", "Mullen", role = c("aut", "cre"), email = "lincoln@lincolnmullen.com", From 1fb3c95485f9ef8f5d09eb05f0acd73e26be134d Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:44:09 -0400 Subject: [PATCH 3/3] Update `NEWS` --- NEWS.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 322d258..7af60d8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ -# historydata 0.2.0.9002 (in development) +# historydata (in development) +# historydata 0.3.0 + +- Update URLs in docs - Add rOpenSci footer to `README` - Add `LICENSE.md` - Add patch increment to version number