Skip to content

Commit bd66eae

Browse files
hadleycran-robot
hadley
authored and
cran-robot
committed
version 2.5.4
1 parent 2fc6432 commit bd66eae

File tree

11 files changed

+46
-42
lines changed

11 files changed

+46
-42
lines changed

‎DESCRIPTION‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Package: haven
22
Title: Import and Export 'SPSS', 'Stata' and 'SAS' Files
3-
Version: 2.5.3
3+
Version: 2.5.4
44
Authors@R: c(
55
person("Hadley", "Wickham", , "[email protected]", role = c("aut", "cre")),
66
person("Evan", "Miller", role = c("aut", "cph"),
77
comment = "Author of included ReadStat code"),
88
person("Danny", "Smith", role = "aut"),
9-
person("RStudio", role = c("cph", "fnd"))
9+
person("Posit Software, PBC", role = c("cph", "fnd"))
1010
)
1111
Description: Import foreign statistical formats into R via the embedded
1212
'ReadStat' C library, <https://github.com/WizardMac/ReadStat>.
@@ -28,11 +28,11 @@ Encoding: UTF-8
2828
RoxygenNote: 7.2.3
2929
SystemRequirements: GNU make, zlib: zlib1g-dev (deb), zlib-devel (rpm)
3030
NeedsCompilation: yes
31-
Packaged: 2023-06-29 21:30:23 UTC; hadleywickham
31+
Packaged: 2023-11-30 13:28:43 UTC; hadleywickham
3232
Author: Hadley Wickham [aut, cre],
3333
Evan Miller [aut, cph] (Author of included ReadStat code),
3434
Danny Smith [aut],
35-
RStudio [cph, fnd]
35+
Posit Software, PBC [cph, fnd]
3636
Maintainer: Hadley Wickham <[email protected]>
3737
Repository: CRAN
38-
Date/Publication: 2023-06-30 20:00:02 UTC
38+
Date/Publication: 2023-11-30 15:10:02 UTC

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2013-2019
2-
COPYRIGHT HOLDER: Hadley Wickham; RStudio; and Evan Miller
1+
YEAR: 2023
2+
COPYRIGHT HOLDER: haven authors

‎MD5‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
97418066bf7ac40398720a0889d89ea3 *DESCRIPTION
2-
59057db2fcc7f8f6bb930846cc7ae761 *LICENSE
1+
c3bc6af72eb420df11095cdd17267bb5 *DESCRIPTION
2+
38e4dadd759e658ca23295b4e69c8630 *LICENSE
33
3069948a2b73339ed41dbfc998f4d4ed *NAMESPACE
4-
84514f712215a799382f6f60d979a223 *NEWS.md
4+
7da9b46dfd96c4d24f30c320b542be92 *NEWS.md
55
e3412da1ca93eb6285d9644d2a07db8e *R/as_factor.R
66
7eed111c08f85088c6225b5782675f13 *R/cpp11.R
77
abe999b7fa23ff099f13d84234cb7855 *R/haven-package.R
@@ -22,15 +22,15 @@ ea607e28b5195ab0135ccde63d99dbdf *R/labelled_spss.R
2222
2e572376deee0b066ce9ed926df35586 *R/zap_widths.R
2323
7fc3339c794878bdf42aad17d9aa974c *R/zzz.R
2424
6cd39715085a4008e71c1aee78c8144a *README.md
25-
3c2bfa722ed3c6fd36525ae4d3809614 *build/vignette.rds
25+
982702b633f1da68408405a014604ade *build/vignette.rds
2626
bc7baead3b6080f04dc81efd2fe1ff39 *cleanup
2727
1518305284b6eb1c6fe933781e75d1fe *configure
2828
d41d8cd98f00b204e9800998ecf8427e *configure.win
2929
d8a370e0744296e9fa777a6a7a446431 *inst/doc/datetimes.Rmd
3030
ae1ee5fe5afb7d277cbfe667dafc27c0 *inst/doc/datetimes.html
31-
d65caa7be28eceb46483900f58d129db *inst/doc/semantics.R
31+
41fb9352a7c332ca5b36e18d8b5edc94 *inst/doc/semantics.R
3232
7597ff3a37dd05812a625a401f75ab60 *inst/doc/semantics.Rmd
33-
4ebe11b2d4dcf1ca3eca8e1b6ffdc5a5 *inst/doc/semantics.html
33+
5fcbb931aa891c706696bc50212a3046 *inst/doc/semantics.html
3434
782776cdad132bd02616ab5e0ddbb1a6 *inst/examples/iris.dta
3535
6d7292019b3784d97ba2e2ced4ce5bac *inst/examples/iris.sas7bdat
3636
9eec419726af6bb92009b25c5224e32b *inst/examples/iris.sav
@@ -43,8 +43,8 @@ c3978703d8f40f2679795335715e98f4 *man/figures/lifecycle-experimental.svg
4343
27b879bf3677ea76e3991d56ab324081 *man/figures/lifecycle-questioning.svg
4444
53b3f893324260b737b3c46ed2a0e643 *man/figures/lifecycle-stable.svg
4545
1c1fe7a759b86dc6dbcbe7797ab8246c *man/figures/lifecycle-superseded.svg
46-
0fa3558f0a322190305e9aa9c560305e *man/figures/logo.png
47-
b8896dd99002143c76f20e7a18a8b692 *man/haven-package.Rd
46+
9b6682afa4c73e3df70f7d2b37433ad3 *man/figures/logo.png
47+
4888bf26a9c1331bd5fe2f904a8a7b3f *man/haven-package.Rd
4848
77d25548d3a63d81e33b7cab8bc49554 *man/labelled.Rd
4949
d5a3f8c86262f72ff7705a9cfcc54131 *man/labelled_spss.Rd
5050
24caa8b914409540e21ab4643fa6b3c5 *man/print_labels.Rd
@@ -61,11 +61,11 @@ cee7653156802db60b699a543005cbd7 *man/zap_formats.Rd
6161
e9ff556e714b7ad8f979b048dee43786 *man/zap_labels.Rd
6262
769d5161d295987b7c3bb18c61c24d5c *man/zap_missing.Rd
6363
1a288019a7882014999286262ecbf19d *man/zap_widths.Rd
64-
f2bea07d45886e42d7d63463a717eb92 *src/DfReader.cpp
64+
423329eb16a8ddf757612803e1784d03 *src/DfReader.cpp
6565
74cb9e923c91a96149844a721d6b2d9d *src/DfWriter.cpp
6666
b746a25e92862049035b66165241390c *src/Makevars.in
6767
913ef0ded6947861f7d1c835500c84b9 *src/Makevars.win
68-
cb7f8b892397337c54b7c822b0bd0506 *src/cpp11.cpp
68+
7011ee6834d36d50a4c150d7f500a054 *src/cpp11.cpp
6969
8479a5125b7e2ff4fd0ee78207eb1e79 *src/haven_types.cpp
7070
e02d7d3096abb42d59ffa98896ea6f30 *src/haven_types.h
7171
103dff612cd33e793e40e7248ad66baa *src/readstat/CKHashTable.c

‎NEWS.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# haven 2.5.4
2+
3+
* Fix for upcoming R-devel change.
4+
15
# haven 2.5.3
26

37
* Fix for upcoming R-devel change.

‎build/vignette.rds‎

0 Bytes
Binary file not shown.

‎inst/doc/semantics.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## ---- include = FALSE---------------------------------------------------------
1+
## ----include = FALSE----------------------------------------------------------
22
library(haven)
33
knitr::opts_chunk$set(
44
collapse = TRUE,

‎inst/doc/semantics.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</style>
5050
<style type="text/css" data-origin="pandoc">
5151
pre > code.sourceCode { white-space: pre; position: relative; }
52-
pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
52+
pre > code.sourceCode > span { line-height: 1.25; }
5353
pre > code.sourceCode > span:empty { height: 1.2em; }
5454
.sourceCode { overflow: visible; }
5555
code.sourceCode > span { color: inherit; text-decoration: inherit; }
@@ -380,7 +380,7 @@ <h3><code>labelled()</code></h3>
380380
<span id="cb1-4"><a href="#cb1-4" tabindex="-1"></a>)</span>
381381
<span id="cb1-5"><a href="#cb1-5" tabindex="-1"></a>x1</span>
382382
<span id="cb1-6"><a href="#cb1-6" tabindex="-1"></a><span class="co">#&gt; &lt;labelled&lt;integer&gt;[5]&gt;</span></span>
383-
<span id="cb1-7"><a href="#cb1-7" tabindex="-1"></a><span class="co">#&gt; [1] 3 5 1 4 2</span></span>
383+
<span id="cb1-7"><a href="#cb1-7" tabindex="-1"></a><span class="co">#&gt; [1] 4 2 5 1 3</span></span>
384384
<span id="cb1-8"><a href="#cb1-8" tabindex="-1"></a><span class="co">#&gt; </span></span>
385385
<span id="cb1-9"><a href="#cb1-9" tabindex="-1"></a><span class="co">#&gt; Labels:</span></span>
386386
<span id="cb1-10"><a href="#cb1-10" tabindex="-1"></a><span class="co">#&gt; value label</span></span>
@@ -404,10 +404,10 @@ <h3><code>labelled()</code></h3>
404404
datastructure that you can convert into a regular R data frame. You can
405405
do this by either converting to a factor or stripping the labels:</p>
406406
<div class="sourceCode" id="cb2"><pre class="sourceCode r"><code class="sourceCode r"><span id="cb2-1"><a href="#cb2-1" tabindex="-1"></a><span class="fu">as_factor</span>(x1)</span>
407-
<span id="cb2-2"><a href="#cb2-2" tabindex="-1"></a><span class="co">#&gt; [1] 3 Bad Good 4 2 </span></span>
407+
<span id="cb2-2"><a href="#cb2-2" tabindex="-1"></a><span class="co">#&gt; [1] 4 2 Bad Good 3 </span></span>
408408
<span id="cb2-3"><a href="#cb2-3" tabindex="-1"></a><span class="co">#&gt; Levels: Good 2 3 4 Bad</span></span>
409409
<span id="cb2-4"><a href="#cb2-4" tabindex="-1"></a><span class="fu">zap_labels</span>(x1)</span>
410-
<span id="cb2-5"><a href="#cb2-5" tabindex="-1"></a><span class="co">#&gt; [1] 3 5 1 4 2</span></span>
410+
<span id="cb2-5"><a href="#cb2-5" tabindex="-1"></a><span class="co">#&gt; [1] 4 2 5 1 3</span></span>
411411
<span id="cb2-6"><a href="#cb2-6" tabindex="-1"></a></span>
412412
<span id="cb2-7"><a href="#cb2-7" tabindex="-1"></a><span class="fu">as_factor</span>(x2)</span>
413413
<span id="cb2-8"><a href="#cb2-8" tabindex="-1"></a><span class="co">#&gt; [1] Male Female Female Female Male </span></span>
@@ -429,30 +429,30 @@ <h3><code>labelled()</code></h3>
429429
<span id="cb3-8"><a href="#cb3-8" tabindex="-1"></a><span class="co">#&gt; # A tibble: 5 × 3</span></span>
430430
<span id="cb3-9"><a href="#cb3-9" tabindex="-1"></a><span class="co">#&gt; x1 x2 z</span></span>
431431
<span id="cb3-10"><a href="#cb3-10" tabindex="-1"></a><span class="co">#&gt; &lt;int+lbl&gt; &lt;chr+lbl&gt; &lt;int&gt;</span></span>
432-
<span id="cb3-11"><a href="#cb3-11" tabindex="-1"></a><span class="co">#&gt; 1 3 M [Male] 1</span></span>
433-
<span id="cb3-12"><a href="#cb3-12" tabindex="-1"></a><span class="co">#&gt; 2 5 [Bad] F [Female] 2</span></span>
434-
<span id="cb3-13"><a href="#cb3-13" tabindex="-1"></a><span class="co">#&gt; 3 1 [Good] F [Female] 3</span></span>
435-
<span id="cb3-14"><a href="#cb3-14" tabindex="-1"></a><span class="co">#&gt; 4 4 F [Female] 4</span></span>
436-
<span id="cb3-15"><a href="#cb3-15" tabindex="-1"></a><span class="co">#&gt; 5 2 M [Male] 5</span></span>
432+
<span id="cb3-11"><a href="#cb3-11" tabindex="-1"></a><span class="co">#&gt; 1 4 M [Male] 1</span></span>
433+
<span id="cb3-12"><a href="#cb3-12" tabindex="-1"></a><span class="co">#&gt; 2 2 F [Female] 2</span></span>
434+
<span id="cb3-13"><a href="#cb3-13" tabindex="-1"></a><span class="co">#&gt; 3 5 [Bad] F [Female] 3</span></span>
435+
<span id="cb3-14"><a href="#cb3-14" tabindex="-1"></a><span class="co">#&gt; 4 1 [Good] F [Female] 4</span></span>
436+
<span id="cb3-15"><a href="#cb3-15" tabindex="-1"></a><span class="co">#&gt; 5 3 M [Male] 5</span></span>
437437
<span id="cb3-16"><a href="#cb3-16" tabindex="-1"></a></span>
438438
<span id="cb3-17"><a href="#cb3-17" tabindex="-1"></a><span class="fu">zap_labels</span>(df)</span>
439439
<span id="cb3-18"><a href="#cb3-18" tabindex="-1"></a><span class="co">#&gt; # A tibble: 5 × 3</span></span>
440440
<span id="cb3-19"><a href="#cb3-19" tabindex="-1"></a><span class="co">#&gt; x1 x2 z</span></span>
441441
<span id="cb3-20"><a href="#cb3-20" tabindex="-1"></a><span class="co">#&gt; &lt;int&gt; &lt;chr&gt; &lt;int&gt;</span></span>
442-
<span id="cb3-21"><a href="#cb3-21" tabindex="-1"></a><span class="co">#&gt; 1 3 M 1</span></span>
443-
<span id="cb3-22"><a href="#cb3-22" tabindex="-1"></a><span class="co">#&gt; 2 5 F 2</span></span>
444-
<span id="cb3-23"><a href="#cb3-23" tabindex="-1"></a><span class="co">#&gt; 3 1 F 3</span></span>
445-
<span id="cb3-24"><a href="#cb3-24" tabindex="-1"></a><span class="co">#&gt; 4 4 F 4</span></span>
446-
<span id="cb3-25"><a href="#cb3-25" tabindex="-1"></a><span class="co">#&gt; 5 2 M 5</span></span>
442+
<span id="cb3-21"><a href="#cb3-21" tabindex="-1"></a><span class="co">#&gt; 1 4 M 1</span></span>
443+
<span id="cb3-22"><a href="#cb3-22" tabindex="-1"></a><span class="co">#&gt; 2 2 F 2</span></span>
444+
<span id="cb3-23"><a href="#cb3-23" tabindex="-1"></a><span class="co">#&gt; 3 5 F 3</span></span>
445+
<span id="cb3-24"><a href="#cb3-24" tabindex="-1"></a><span class="co">#&gt; 4 1 F 4</span></span>
446+
<span id="cb3-25"><a href="#cb3-25" tabindex="-1"></a><span class="co">#&gt; 5 3 M 5</span></span>
447447
<span id="cb3-26"><a href="#cb3-26" tabindex="-1"></a><span class="fu">as_factor</span>(df)</span>
448448
<span id="cb3-27"><a href="#cb3-27" tabindex="-1"></a><span class="co">#&gt; # A tibble: 5 × 3</span></span>
449449
<span id="cb3-28"><a href="#cb3-28" tabindex="-1"></a><span class="co">#&gt; x1 x2 z</span></span>
450450
<span id="cb3-29"><a href="#cb3-29" tabindex="-1"></a><span class="co">#&gt; &lt;fct&gt; &lt;fct&gt; &lt;int&gt;</span></span>
451-
<span id="cb3-30"><a href="#cb3-30" tabindex="-1"></a><span class="co">#&gt; 1 3 Male 1</span></span>
452-
<span id="cb3-31"><a href="#cb3-31" tabindex="-1"></a><span class="co">#&gt; 2 Bad Female 2</span></span>
453-
<span id="cb3-32"><a href="#cb3-32" tabindex="-1"></a><span class="co">#&gt; 3 Good Female 3</span></span>
454-
<span id="cb3-33"><a href="#cb3-33" tabindex="-1"></a><span class="co">#&gt; 4 4 Female 4</span></span>
455-
<span id="cb3-34"><a href="#cb3-34" tabindex="-1"></a><span class="co">#&gt; 5 2 Male 5</span></span></code></pre></div>
451+
<span id="cb3-30"><a href="#cb3-30" tabindex="-1"></a><span class="co">#&gt; 1 4 Male 1</span></span>
452+
<span id="cb3-31"><a href="#cb3-31" tabindex="-1"></a><span class="co">#&gt; 2 2 Female 2</span></span>
453+
<span id="cb3-32"><a href="#cb3-32" tabindex="-1"></a><span class="co">#&gt; 3 Bad Female 3</span></span>
454+
<span id="cb3-33"><a href="#cb3-33" tabindex="-1"></a><span class="co">#&gt; 4 Good Female 4</span></span>
455+
<span id="cb3-34"><a href="#cb3-34" tabindex="-1"></a><span class="co">#&gt; 5 3 Male 5</span></span></code></pre></div>
456456
</div>
457457
</div>
458458
<div id="missing-values" class="section level2">

‎man/figures/logo.png‎

-32 Bytes
Loading

‎man/haven-package.Rd‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/DfReader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ class DfReader {
400400
label_set.add(haven_double_value(value), label_s);
401401
break;
402402
default:
403-
Rf_warning("Unsupported label type: %s", value.type);
403+
Rf_warning("Unsupported label type: %i", value.type);
404404
}
405405
}
406406

0 commit comments

Comments
 (0)