Skip to content

Commit 178540f

Browse files
committed
CRAN v2.3
1 parent f310858 commit 178540f

File tree

8 files changed

+21
-26
lines changed

8 files changed

+21
-26
lines changed

DESCRIPTION

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: psidR
22
Type: Package
33
Title: Build Panel Data Sets from PSID Raw Data
4-
Version: 2.2
5-
Date: 2024-05-29
4+
Version: 2.3
5+
Date: 2024-09-23
66
Author: Florian Oswald
77
Maintainer: Florian Oswald <[email protected]>
88
Description: Makes it easy to build panel data in wide format from Panel Survey
@@ -15,8 +15,7 @@ Description: Makes it easy to build panel data in wide format from Panel Survey
1515
waves. There are different panel data designs and sample subsetting criteria
1616
implemented ("SRC", "SEO", "immigrant" and "latino" samples).
1717
Depends: R (>= 3.5.0)
18-
URL: https://github.com/floswald/psidR,
19-
http://floswald.github.io/psidR/
18+
URL: https://github.com/floswald/psidR
2019
Imports:
2120
data.table,
2221
RCurl,
@@ -25,10 +24,11 @@ Imports:
2524
openxlsx,
2625
futile.logger
2726
License: GPL-3
27+
Encoding: UTF-8
2828
Collate:
2929
'build.panel.r'
3030
'makeids.r'
3131
'psidR-package.r'
3232
Suggests:
3333
testthat
34-
RoxygenNote: 7.2.3
34+
RoxygenNote: 7.3.2

R/makeids.r

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ makeids.wealth <- function(){
100100

101101
#' get.psid connects to PSID database and downloads into Rda
102102
#'
103-
#' see \url{http://asdfree.com/} for other usage and \url{https://stackoverflow.com/questions/15853204/how-to-login-and-then-download-a-file-from-aspx-web-pages-with-r}
103+
#' see \url{https://asdfree.com/} for other usage and \url{https://stackoverflow.com/questions/15853204/how-to-login-and-then-download-a-file-from-aspx-web-pages-with-r}
104104
#' @author Anthony Damico <ajdamico@@gmail.com>
105105
#' @param file string psid file number
106106
#' @param name string of filename on disc
107-
#' @param params postForm{RCurl} parameters
108-
#' @param curl postForm{RCurl} curl handle
107+
#' @param params `postForm` (RCurl) parameters
108+
#' @param curl `postForm` (RCurl) curl handle
109109
get.psid <- function( file , name , params , curl ){
110110

111111
html = postForm('http://simba.isr.umich.edu/u/Login.aspx', .params = params, curl = curl)

R/psidR-package.r

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#' @importFrom openxlsx read.xlsx
1414
#' @importFrom stats rlnorm rnorm runif
1515
#' @importFrom utils object.size tail unzip head write.table
16-
#' @docType package
1716
#' @name psidR
1817
#'
19-
NULL
18+
"_PACKAGE"

inst/CITATION

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ citHeader("To cite the 'psidR' package in publications use:")
33
year = sub('.*(2[[:digit:]]{3})-.*', '\\1', meta$Date, perl = TRUE)
44
vers = paste('R package version', meta$Version)
55

6-
citEntry(
7-
entry = 'manual',
6+
bibentry('manual',
87
title = paste('psidR:', meta$Title),
98
author = 'Florian Oswald',
109
year = year,

inst/psid-lists/psid.xlsx

1.43 MB
Binary file not shown.

man/get.psid.Rd

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/psidR.Rd

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test_buildpanel.R

-11
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,5 @@ test_that("check subsetting to core/immigrant/latino", {
114114

115115
} )
116116

117-
test_that("wrong famvars and indvars raises an error",{
118-
cwf <- openxlsx::read.xlsx("http://psidonline.isr.umich.edu/help/xyr/psid.xlsx")
119-
famvars = getNamesPSID("ER17013", cwf, years = c(2005, 2007, 2009))
120-
expect_error(build.panel(datadir=my.dir,fam.vars=famvars) )
121-
122-
head_age_var_name <- getNamesPSID("ER17013", cwf, years=c(2003))
123-
124-
famvars = data.frame(year=c(2005, 2007, 2009),age=head_age_var_name)
125-
expect_error(build.panel(datadir=my.dir,fam.vars=famvars) )
126-
127-
})
128117

129118

0 commit comments

Comments
 (0)