Skip to content

Commit a75ff6b

Browse files
committed
Merge branch 'main' into request-registry-filter
2 parents ac73608 + fd067dd commit a75ff6b

25 files changed

+444
-60
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ jobs:
3333
with:
3434
extra-packages: any::rcmdcheck
3535
needs: check
36+
37+
- name: temporary fix, need dev crul
38+
run: |
39+
install.packages("pak")
40+
pak::pak("ropensci/crul")
41+
shell: Rscript {0}
3642

3743
- name: Session info
3844
run: |
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
on: push
2+
name: revdep
3+
4+
jobs:
5+
revdep:
6+
runs-on: ubuntu-latest
7+
if: startsWith(github.event.head_commit.message, 'REVDEPCHECK')
8+
name: ubuntu-latest (release)
9+
strategy:
10+
fail-fast: false
11+
12+
env:
13+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
14+
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- uses: r-lib/actions/setup-r@v2
20+
with:
21+
r-version: release
22+
23+
- uses: r-lib/actions/setup-pandoc@v2
24+
25+
- uses: r-lib/actions/setup-r-dependencies@v2
26+
with:
27+
extra-packages: |
28+
any::pak
29+
30+
- name: temporary fix, need dev crul
31+
run: |
32+
install.packages("pak")
33+
pak::pak(c("ropensci/crul", "ropensci/vcr"))
34+
shell: Rscript {0}
35+
36+
- name: Revdepcheck
37+
run: |
38+
Rscript -e "pak::pak('r-lib/revdepcheck')" \
39+
-e "revdepcheck::revdep_reset()" \
40+
-e "revdepcheck::revdep_check(num_workers=12)"
41+
42+
- name: Upload revdepcheck results
43+
uses: actions/upload-artifact@v4
44+
with:
45+
name: ubuntu-latest-r-release-results
46+
path: revdep/*.md

DESCRIPTION

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Description: Stubbing and setting expectations on 'HTTP' requests.
66
'HTTP' method, query parameters, request body, headers and
77
more. Can be used for unit tests or outside of a testing
88
context.
9-
Version: 2.1.1.91
9+
Version: 2.2.0.9000
1010
Authors@R: c(
1111
person("Scott", "Chamberlain", role = c("aut", "cre"), email =
1212
"myrmecocystus+r@gmail.com", comment = c(ORCID="0000-0003-1444-9135")),
@@ -41,7 +41,6 @@ Suggests:
4141
httr2,
4242
diffobj,
4343
withr
44-
Remotes: ropensci/crul
4544
RoxygenNote: 7.3.2
4645
Config/testthat/edition: 3
4746
Config/testthat/parallel: true

NEWS.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
webmockr (2.1.0)
2-
=========
1+
# webmockr (development version)
2+
3+
webmockr 2.2.0
4+
==============
5+
6+
## MINOR IMPROVEMENTS
7+
8+
* webmockr is no longer integrated with vcr; the two packages used to depend on one another, but no longer do. this should not impact your usage of `webmockr` (#149) (#150)
9+
* better implementation of quiet in `enable()`/`disable()` (#146) thanks @hadley
10+
* eliminate partial match warnings (#147) thanks @hadley
11+
12+
13+
webmockr 2.1.0
14+
==============
315

416
## MINOR IMPROVEMENTS
517

R/mocking-disk-writing.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#' Mocking writing to disk
22
#'
33
#' @name mocking-disk-writing
4-
#' @examples
4+
#' @examplesIf interactive()
55
#' # enable mocking
66
#' enable()
77
#'

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ knitr::opts_chunk$set(
1111

1212
<!-- NOTE: run `make readme` to generate the README.md -->
1313

14-
[![cran checks](https://badges.cranchecks.info/worst/webmockr.svg)](https://cloud.r-project.org/web/checks/check_results_webmockr.html)
14+
[![cran checks](https://badges.cranchecks.info/worst/webmockr.svg)](https://CRAN.R-project.org/package=webmockr)
1515
[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
1616
[![R-CMD-check](https://github.com/ropensci/webmockr/workflows/R-CMD-check/badge.svg)](https://github.com/ropensci/webmockr/actions/)
1717
[![codecov](https://codecov.io/gh/ropensci/webmockr/branch/main/graph/badge.svg?token=1zWlEQbaEh)](https://app.codecov.io/gh/ropensci/webmockr)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ webmockr
55

66
<!-- NOTE: run `make readme` to generate the README.md -->
77

8-
[![cran checks](https://badges.cranchecks.info/worst/webmockr.svg)](https://cloud.r-project.org/web/checks/check_results_webmockr.html)
8+
[![cran checks](https://badges.cranchecks.info/worst/webmockr.svg)](https://CRAN.R-project.org/package=webmockr)
99
[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
1010
[![R-CMD-check](https://github.com/ropensci/webmockr/workflows/R-CMD-check/badge.svg)](https://github.com/ropensci/webmockr/actions/)
1111
[![codecov](https://codecov.io/gh/ropensci/webmockr/branch/main/graph/badge.svg?token=1zWlEQbaEh)](https://app.codecov.io/gh/ropensci/webmockr)

codemeta.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"codeRepository": "https://github.com/ropensci/webmockr",
99
"issueTracker": "https://github.com/ropensci/webmockr/issues",
1010
"license": "https://spdx.org/licenses/MIT",
11-
"version": "2.1.0",
11+
"version": "2.2.0",
1212
"programmingLanguage": {
1313
"@type": "ComputerLanguage",
1414
"name": "R",
@@ -58,6 +58,7 @@
5858
"@type": "SoftwareApplication",
5959
"identifier": "testthat",
6060
"name": "testthat",
61+
"version": ">= 3.0.0",
6162
"provider": {
6263
"@id": "https://cran.r-project.org",
6364
"@type": "Organization",
@@ -250,5 +251,5 @@
250251
"applicationCategory": "Web",
251252
"isPartOf": "https://ropensci.org",
252253
"keywords": ["http", "https", "API", "web-services", "curl", "mock", "mocking", "fakeweb", "http-mocking", "testing", "testing-tools", "tdd"],
253-
"fileSize": "404.358KB"
254+
"fileSize": "395.679KB"
254255
}

cran-comments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
## revdepcheck results
1212

13-
We checked the 18 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package, and saw no issues.
13+
We checked the 21 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package, and saw no issues.
1414

1515

1616
---
1717

18-
This version includes many minor improvements.
18+
This version includes many minor improvements, and removes dependency on vcr, which will also be submitted to CRAN soon.
1919

2020
Thanks!
2121
Scott Chamberlain

man/mocking-disk-writing.Rd

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

0 commit comments

Comments
 (0)