Skip to content

Commit 51cbbaf

Browse files
committed
Merge commit '005b78659c2271a03ed016f13df0d32f8b1e66e5'
#Conflicts: # R/xml2-package.R # src/init.c
2 parents ea377a9 + 005b786 commit 51cbbaf

File tree

10 files changed

+14
-19
lines changed

10 files changed

+14
-19
lines changed

.github/workflows/test-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
covr::codecov(
3232
quiet = FALSE,
3333
clean = FALSE,
34-
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
34+
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
3535
)
3636
shell: Rscript {0}
3737

DESCRIPTION

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Package: xml2
22
Title: Parse XML
33
Version: 1.3.5.9000
44
Authors@R: c(
5-
person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre")),
5+
person("Hadley", "Wickham", , "hadley@posit.co", role = c("aut", "cre")),
66
person("Jim", "Hester", role = "aut"),
77
person("Jeroen", "Ooms", role = "aut"),
8-
person("RStudio", role = c("cph", "fnd")),
8+
person("Posit Software, PBC", role = c("cph", "fnd")),
99
person("R Foundation", role = "ctb",
1010
comment = "Copy of R-project homepage cached as example")
1111
)
@@ -18,11 +18,8 @@ Depends:
1818
R (>= 3.6.0)
1919
Imports:
2020
cli,
21-
glue,
22-
lifecycle,
2321
methods,
24-
rlang (>= 1.1.0),
25-
withr
22+
rlang (>= 1.1.0)
2623
Suggests:
2724
covr,
2825
curl,

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2020
1+
YEAR: 2023
22
COPYRIGHT HOLDER: xml2 authors

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MIT License
22

3-
Copyright (c) 2020 xml2 authors
3+
Copyright (c) 2023 xml2 authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

NAMESPACE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,5 @@ exportClasses(xml_missing)
213213
exportClasses(xml_node)
214214
exportClasses(xml_nodeset)
215215
import(rlang)
216-
importFrom(glue,glue)
217-
importFrom(lifecycle,deprecated)
218216
importFrom(methods,setOldClass)
219217
useDynLib(xml2, .registration = TRUE)

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# xml2 (development version)
22

3+
* Remove unused dependencies on glue, withr and lifecycle (@mgirlich).
4+
35
# xml2 1.3.5
46

57
* Small speedup for `xml_find_all()` (@mgirlich, #393).

R/xml2-package.R

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
## usethis namespace: start
55
#' @import rlang
6-
#' @importFrom glue glue
7-
#' @importFrom lifecycle deprecated
86
#' @useDynLib xml2, .registration = TRUE
97
## usethis namespace: end
108
NULL

README.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ install.packages("xml2")
3535
or you can install the development version from github, using `devtools`:
3636

3737
```r
38-
# install.packages("devtools")
39-
devtools::install_github("r-lib/xml2")
38+
# install.packages("pak")
39+
pak::pak("r-lib/xml2")
4040
```
4141

4242
## Usage

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ or you can install the development version from github, using
2929
`devtools`:
3030

3131
``` r
32-
# install.packages("devtools")
33-
devtools::install_github("r-lib/xml2")
32+
# install.packages("pak")
33+
pak::pak("r-lib/xml2")
3434
```
3535

3636
## Usage

man/xml2-package.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)