Skip to content

Commit fd944b5

Browse files
spgarbetcran-robot
authored andcommitted
version 2.2.2
1 parent 2070fb5 commit fd944b5

File tree

9 files changed

+41
-21
lines changed

9 files changed

+41
-21
lines changed

DESCRIPTION

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
Package: yaml
22
Type: Package
33
Title: Methods to Convert R Data to YAML and Back
4-
Date: 2020-01-23
5-
Version: 2.2.1
4+
Date: 2022-01-24
5+
Version: 2.2.2
66
Suggests: RUnit
77
Author: Jeremy Stephens [aut, cre], Kirill Simonov [aut], Yihui Xie [ctb],
88
Zhuoer Dong [ctb], Hadley Wickham [ctb], Jeffrey Horner [ctb], reikoch [ctb],
9-
Will Beasley [ctb], Brendan O'Connor [ctb], Gregory R. Warnes [ctb]
10-
Maintainer: Jeremy Stephens <[email protected]>
9+
Will Beasley [ctb], Brendan O'Connor [ctb], Gregory R. Warnes [ctb],
10+
Michael Quinn [ctb], Zhian N. Kamvar [ctb]
11+
Maintainer: Shawn Garbett <[email protected]>
1112
License: BSD_3_clause + file LICENSE
1213
Description: Implements the 'libyaml' 'YAML' 1.1 parser and emitter
13-
(<http://pyyaml.org/wiki/LibYAML>) for R.
14-
URL: https://github.com/viking/r-yaml/
15-
BugReports: https://github.com/viking/r-yaml/issues
14+
(<https://pyyaml.org/wiki/LibYAML>) for R.
15+
URL: https://github.com/vubiostat/r-yaml/
16+
BugReports: https://github.com/vubiostat/r-yaml/issues
1617
NeedsCompilation: yes
17-
Packaged: 2020-01-30 20:29:56 UTC; stephej1
18+
Packaged: 2022-01-24 19:01:43 UTC; stephej1
1819
Repository: CRAN
19-
Date/Publication: 2020-02-01 05:50:02 UTC
20+
Date/Publication: 2022-01-25 11:10:02 UTC

MD5

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bbba10d958545e3425cc20f316d9da75 *COPYING
2-
a221dbad3bb496c69f7bc2ccb9658a79 *DESCRIPTION
2+
da26e0f99f2f0301528412d29aad270f *DESCRIPTION
33
98b6f1d7e7a36de0353698db9027b614 *LICENSE
44
17a16244d43d0cfe5439535f4695dd7f *NAMESPACE
55
b901a42735294b31cf1d91b526714858 *R/as.yaml.R
@@ -8,8 +8,8 @@ b901a42735294b31cf1d91b526714858 *R/as.yaml.R
88
8b6372c5e7440430f4cfadd9fe168a24 *R/yaml.load.R
99
363c5793776f7b432b777ecf3966d950 *R/yaml.load_file.R
1010
59d3ef441a03e63a67784ef7d111f8fe *R/zzz.R
11-
9769fdbe8107879a75976b3f8e66c479 *inst/CHANGELOG
12-
f0a1646d0486e242e59e280cd842ae0d *inst/THANKS
11+
1d34aeb895260ea947c0003e9605d3a3 *inst/CHANGELOG
12+
616265f0a9f5aacfdec8802f2e82d5ff *inst/THANKS
1313
209752829e0543e43d1aa9dcf4c8ddf9 *inst/implicit.re
1414
0625a433dcef8def801ea9ed2a7396c9 *inst/tests/files/merge.yml
1515
b70b0ade3126a031e5bf77d8aa9af4f2 *inst/tests/files/test.yml
@@ -18,10 +18,10 @@ ea58113433e31b75ea47a91797e97106 *inst/tests/test_read_yaml.R
1818
f0258adf12eff3e4ef781d06ed5ca659 *inst/tests/test_write_yaml.R
1919
b34ce0cb01f20793d5a29f9e5a7d790b *inst/tests/test_yaml_load.R
2020
950db19b6035d7ba6d9af37347a5a501 *inst/tests/test_yaml_load_file.R
21-
52adf737c1e77a60b9026b4b1f04de55 *man/as.yaml.Rd
22-
66bde0aa5a9040fba09ba45f3e119f52 *man/read_yaml.Rd
21+
7a24574f29bd6438b57aacb8b0026baa *man/as.yaml.Rd
22+
f79bcd3903860eefa6a1cac15dfc94ff *man/read_yaml.Rd
2323
466b1a01bd0eead68a25633559e01ad3 *man/write_yaml.Rd
24-
ca2808ac99ec3e31a8e7bd8b370dcd32 *man/yaml.load.Rd
24+
5d2bf5fcbffcd7f6d5bf0559b4bfb36e *man/yaml.load.Rd
2525
6b0576349be43cf3d872205b41aff77d *src/Makevars
2626
e65bbd59ff4430b3b9bade49423ea066 *src/api.c
2727
948f2ac1f42b36f9b6ed10ce0291bdb9 *src/dumper.c
@@ -30,12 +30,12 @@ ac7bfac5c1629dd498b3344af3aef5a7 *src/implicit.c
3030
48ac40f4d75fe6b851db1baad7b3c82d *src/loader.c
3131
e5b8c176168b678cdcfb14fdaf2e98d3 *src/parser.c
3232
8d0c428a404cd1121f4aa7f763eae8aa *src/r_emit.c
33-
4c4c2e8ee0a13ab91af0a0db7d869b8c *src/r_ext.c
33+
cfc4b5d58ac887bf2dd6011cefccbe49 *src/r_ext.c
3434
acc43ebc0942c7ec36f4f13ef2fc4747 *src/r_ext.h
3535
856b7bea0f5378e69b0651661e6a8ba9 *src/r_parse.c
3636
efcea8b4a8bcfbc96ae32abd0f18e472 *src/reader.c
3737
a344bb1d48ab1800e4b872bb6f026156 *src/scanner.c
3838
7b2e815cfd48dbfd462f3bd317059e3f *src/writer.c
3939
c2131d7abf1b9c86588c73aef741c14e *src/yaml.h
4040
4b597a363c432743e5c0172eb5fc053d *src/yaml_private.h
41-
ca7a25cb389c2c02888c3ce9095e65bc *tests/RUnit.R
41+
6a3f8273ac9411744a7cacabb5edef3e *tests/RUnit.R

inst/CHANGELOG

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v2.2.2
2+
- change maintainer from Jeremy Stephens to Shawn Garbett
3+
- move Git repository to https://github.com/vubiostat/r-yaml
4+
15
v2.2.1
26
- add merge.precedence option to yaml.load
37
- fix improper handling of explicit '!bool' tag (reported by Luke Goodsell)

inst/THANKS

+2
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ Patches submitted by:
99
- Will Beasley (edefae9)
1010
- Zhuoer Dong (8febaba..28c89f4, 0e34af1)
1111
- Gregory R. Warnes (e3bf914)
12+
- Michael Quinn (9e16411)
13+
- Zhian N. Kamvar (405073b)

man/as.yaml.Rd

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
8080
# custom handler
8181
as.yaml(Sys.time(), handlers = list(
82-
POSIXct = function(x) format(Sys.time(), "\%Y-\%m-\%d")
82+
POSIXct = function(x) format(x, "\%Y-\%m-\%d")
8383
))
8484
8585
# custom handler with verbatim output to change how logical vectors are

man/read_yaml.Rd

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
\references{
4141
YAML: http://yaml.org
4242

43-
libyaml: http://pyyaml.org/wiki/LibYAML
43+
libyaml: https://pyyaml.org/wiki/LibYAML
4444
}
4545
\author{Jeremy Stephens <jeremy.f.stephens@vumc.org>}
4646
\seealso{\code{\link{yaml.load}}, \code{\link{write_yaml}}, \code{\link{yaml.load_file}}}

man/yaml.load.Rd

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
\references{
8585
YAML: http://yaml.org
8686

87-
libyaml: http://pyyaml.org/wiki/LibYAML
87+
libyaml: https://pyyaml.org/wiki/LibYAML
8888

8989
YAML merge specification: http://yaml.org/type/merge.html
9090
}

src/r_ext.c

+11
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Ryaml_set_error_msg(const char *format, ...)
2222

2323
va_start(args, format);
2424
result = vsnprintf(Ryaml_error_msg, ERROR_MSG_SIZE, format, args);
25+
va_end(args);
26+
2527
if (result >= ERROR_MSG_SIZE) {
2628
warning("an error occurred, but the message was too long to format properly");
2729

@@ -255,3 +257,12 @@ void R_init_yaml(DllInfo *dll) {
255257
R_useDynamicSymbols(dll, FALSE);
256258
R_forceSymbols(dll, TRUE);
257259
}
260+
261+
/* .; ;.
262+
* / | | \
263+
* | | | |
264+
* .-----------.
265+
* ' '
266+
* | |
267+
* '=============' viking was here <3
268+
*/

tests/RUnit.R

+3-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ checkNamedListEquals <- function(x, y) {
4040
testSuite <- defineTestSuite(name = "yaml tests",
4141
dirs = system.file("tests", package = "yaml"),
4242
testFileRegexp = "^test_.+",
43-
testFuncRegexp = "^test_.+")
43+
testFuncRegexp = "^test_.+",
44+
rngKind = 'Mersenne-Twister',
45+
rngNormalKind = 'Inversion')
4446

4547
tests <- runTestSuite(testSuite)
4648

0 commit comments

Comments
 (0)