Skip to content

Commit 16b472f

Browse files
krlmlrDavisVaughan
krlmlr
and
DavisVaughan
authored
Require data frame compatibility for setequal() (#6786)
* Require data frame compatibility for setequal() * Results * This repo doesn't use fledge yet * Move NEWS bullet * Tweak tests to use snapshots --------- Co-authored-by: DavisVaughan <[email protected]>
1 parent c48230c commit 16b472f

File tree

8 files changed

+3189
-10116
lines changed

8 files changed

+3189
-10116
lines changed

‎NEWS.md

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

3+
* `setequal()` now requires the input data frames to be compatible, similar to
4+
the other set methods like `setdiff()` or `intersect()` (#6786).
5+
36
# dplyr 1.1.2
47

58
* `count()` better documents that it has a `.drop` argument (#6820).

‎R/sets.R

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,7 @@ setdiff.data.frame <- function(x, y, ...) {
142142
#' @export
143143
setequal.data.frame <- function(x, y, ...) {
144144
check_dots_empty()
145-
if (!is.data.frame(y)) {
146-
abort("`y` must be a data frame.")
147-
}
148-
if (!isTRUE(is_compatible(x, y))) {
149-
return(FALSE)
150-
}
145+
check_compatible(x, y)
151146

152147
cast <- vec_cast_common(x = x, y = y)
153148
all(vec_in(cast$x, cast$y)) && all(vec_in(cast$y, cast$x))

‎revdep/README.md

Lines changed: 39 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,238 +1,146 @@
11
# Revdeps
22

3-
## Failed to check (222)
3+
## Failed to check (132)
44

55
|package |version |error |warning |note |
66
|:--------------------|:-------|:-----|:-------|:----|
77
|abstr |? | | | |
8-
|accept |? | | | |
9-
|ADAM |? | | | |
10-
|afex |? | | | |
11-
|AGread |? | | | |
12-
|agridat |? | | | |
13-
|AMARETTO |? | | | |
14-
|amplican |? | | | |
15-
|autoTS |? | | | |
16-
|bangladesh |? | | | |
17-
|bayesian |? | | | |
18-
|bayesmodels |? | | | |
19-
|bayesnec |? | | | |
20-
|bayesplot |? | | | |
21-
|BayesPostEst |? | | | |
22-
|bayesrules |? | | | |
8+
|NA |? | | | |
239
|bdl |? | | | |
24-
|BiodiversityR |? | | | |
25-
|blocs |? | | | |
26-
|breathtestcore |? | | | |
27-
|brendaDb |? | | | |
28-
|broom.helpers |? | | | |
29-
|broom.mixed |? | | | |
30-
|BUSpaRse |? | | | |
3110
|cancensus |? | | | |
32-
|cattonum |? | | | |
3311
|CCAMLRGIS |? | | | |
34-
|ceRNAnetsim |? | | | |
3512
|choroplethr |3.7.1 |1 | | |
36-
|COMPASS |? | | | |
13+
|cleanTS |0.1.1 |1 | | |
3714
|CoordinateCleaner |2.0-20 |1 | | |
3815
|CopernicusMarine |? | | | |
39-
|CRE |? | | | |
40-
|ctDNAtools |? | | | |
16+
|NA |? | | | |
17+
|ctsem |3.7.2 |1 | | |
4118
|cubble |? | | | |
42-
|cxr |? | | | |
4319
|cyclestreets |? | | | |
44-
|CytoML |? | | | |
45-
|datawizard |? | | | |
20+
|NA |? | | | |
4621
|dbmss |? | | | |
47-
|DeLorean |? | | | |
48-
|DepecheR |? | | | |
49-
|DiffBind |? | | | |
50-
|diffman |? | | | |
51-
|diffrprojects |? | | | |
5222
|dycdtools |? | | | |
5323
|dynamicSDM |? | | | |
54-
|dynfrail |? | | | |
5524
|edbuildmapr |? | | | |
5625
|EFDR |? | | | |
57-
|embed |? | | | |
26+
|eflm |0.3.0 |1 | | |
5827
|EnvExpInd |? | | | |
59-
|epiphy |? | | | |
60-
|escalation |? | | | |
28+
|NA |? | | | |
29+
|NA |? | | | |
30+
|NA |? | | | |
6131
|eSDM |? | | | |
62-
|ESTER |? | | | |
63-
|evaluator |? | | | |
64-
|expstudies |? | | | |
65-
|fable.prophet |? | | | |
66-
|finnts |? | | | |
67-
|fipe |? | | | |
68-
|foieGras |? | | | |
32+
|fgdr |? | | | |
33+
|NA |? | | | |
34+
|NA |? | | | |
35+
|FORTLS |? | | | |
6936
|FRK |? | | | |
7037
|fsr |? | | | |
71-
|geocmeans |? | | | |
7238
|GeodesiCL |1.0.0 |1 | | |
7339
|ggchangepoint |? | | | |
7440
|ggOceanMaps |? | | | |
7541
|ggspatial |? | | | |
76-
|ggstatsplot |? | | | |
7742
|glottospace |? | | | |
7843
|GREENeR |? | | | |
79-
|gtfs2gps |? | | | |
8044
|gumboot |? | | | |
8145
|gwavr |? | | | |
8246
|GWPR.light |? | | | |
8347
|happign |? | | | |
84-
|healthyR.ai |? | | | |
85-
|healthyR.ts |? | | | |
86-
|healthyverse |? | | | |
8748
|himach |? | | | |
88-
|historicalborrowlong |? | | | |
8949
|HYPEtools |? | | | |
9050
|hypsoLoop |? | | | |
9151
|incidence2 |1.2.3 |1 | | |
92-
|INSPECTumours |? | | | |
52+
|NA |? | | | |
9353
|intSDM |1.0.5 |1 | |1 |
94-
|IRexamples |? | | | |
95-
|IsoCorrectoR |? | | | |
54+
|NA |? | | | |
9655
|itsdm |? | | | |
9756
|jpgrid |? | | | |
98-
|loon.ggplot |? | | | |
99-
|loon.shiny |? | | | |
57+
|jpmesh |? | | | |
58+
|NA |? | | | |
10059
|MainExistingDatasets |? | | | |
60+
|NA |? | | | |
10161
|manydata |0.8.2 |1 | | |
10262
|mapboxapi |? | | | |
10363
|mapme.biodiversity |? | | | |
10464
|mapping |? | | | |
105-
|mapsapi |? | | | |
10665
|mapscanner |? | | | |
107-
|marginaleffects |? | | | |
10866
|MazamaSpatialPlots |? | | | |
109-
|merTools |? | | | |
67+
|NA |? | | | |
11068
|meteoland |? | | | |
111-
|modeltime |? | | | |
112-
|modeltime.ensemble |? | | | |
113-
|modeltime.gluonts |? | | | |
114-
|modeltime.h2o |? | | | |
115-
|modeltime.resample |? | | | |
69+
|NA |? | | | |
70+
|NA |? | | | |
11671
|motif |? | | | |
117-
|mpower |? | | | |
11872
|MSclassifR |? | | | |
119-
|multibiasmeta |? | | | |
12073
|naturaList |? | | | |
12174
|ncdfgeom |? | | | |
12275
|nhdplusTools |? | | | |
12376
|nhdR |? | | | |
124-
|nlmixr2est |2.1.3 |1 | | |
125-
|nlmixr2extra |? | | | |
126-
|nlmixr2plot |2.0.7 |1 | | |
127-
|nlmixr2rpt |0.1.0 |1 | | |
77+
|NA |? | | | |
12878
|occCite |? | | | |
129-
|occUncertain |0.1.0 |1 | | |
13079
|oceanexplorer |? | | | |
13180
|oceanis |? | | | |
132-
|ohsome |? | | | |
13381
|OpenLand |? | | | |
134-
|ordbetareg |? | | | |
13582
|palaeoSig |? | | | |
136-
|panelr |? | | | |
137-
|pct |? | | | |
138-
|photosynthesis |? | | | |
139-
|Platypus |? | | | |
140-
|PoolTestR |? | | | |
83+
|NA |? | | | |
84+
|NA |? | | | |
14185
|PopGenHelpR |? | | | |
14286
|ppcSpatial |? | | | |
14387
|prioriactions |? | | | |
144-
|promotionImpact |? | | | |
14588
|PSS.Health |0.6.1 |1 | | |
14689
|rangeModelMetadata |? | | | |
14790
|rbenvo |? | | | |
148-
|RBesT |? | | | |
14991
|rcontroll |? | | | |
150-
|RCzechia |? | | | |
151-
|rdss |? | | | |
92+
|NA |? | | | |
15293
|redist |? | | | |
153-
|remap |? | | | |
154-
|report |? | | | |
155-
|rGhanaCensus |? | | | |
156-
|rnaturalearth |? | | | |
94+
|NA |? | | | |
15795
|roads |? | | | |
158-
|Robyn |? | | | |
15996
|Rsagacmd |? | | | |
16097
|rsinaica |? | | | |
161-
|rstac |? | | | |
162-
|rxode2 |2.0.11 |1 | | |
163-
|rxode2et |2.0.9 |1 | | |
16498
|saeSim |0.11.0 |1 | | |
165-
|SAMtool |? | | | |
16699
|sandwichr |? | | | |
100+
|NA |? | | | |
167101
|SDGdetector |2.7.1 |1 | | |
168102
|SDLfilter |? | | | |
169-
|sdmApp |? | | | |
170-
|sf |? | | | |
171-
|sfdep |? | | | |
172103
|sfnetworks |? | | | |
173-
|sftime |? | | | |
174104
|ShellChron |? | | | |
105+
|NA |? | | | |
175106
|simodels |? | | | |
176107
|simplevis |? | | | |
177-
|sjPlot |? | | | |
178-
|sjstats |? | | | |
179-
|sknifedatar |? | | | |
180108
|slendr |? | | | |
181109
|sociome |2.1.0 |1 | |1 |
182-
|SOMEnv |1.1.2 |1 | | |
183-
|SpaDES.tools |? | | | |
184110
|SPARTAAS |1.1.0 |1 | | |
185111
|spatgeom |? | | | |
186-
|SpatialEpi |1.2.8 |1 | | |
187112
|SpatialKDE |? | | | |
188113
|spatialrisk |? | | | |
189-
|spatialsample |? | | | |
190114
|spDates |? | | | |
191-
|spectacles |0.5-3 |1 | | |
192115
|spnaf |? | | | |
193116
|spNetwork |? | | | |
194117
|spqdep |? | | | |
195-
|spsur |1.0.2.5 |1 | |1 |
196-
|spup |? | | | |
197-
|stars |? | | | |
198-
|starsTileServer |? | | | |
199-
|stats19 |? | | | |
200-
|statsExpressions |? | | | |
118+
|NA |? | | | |
201119
|stplanr |? | | | |
202120
|stppSim |? | | | |
121+
|NA |? | | | |
203122
|stxplore |? | | | |
204123
|SUNGEO |? | | | |
205124
|swfscAirDAS |0.2.3 |1 | | |
206125
|SWTools |? | | | |
126+
|NA |? | | | |
207127
|telemac |? | | | |
208-
|tidybayes |? | | | |
209-
|tidyposterior |? | | | |
210-
|tidySEM |? | | | |
211-
|tilemaps |? | | | |
212-
|timetk |? | | | |
213-
|tipmap |? | | | |
214-
|tmap |? | | | |
128+
|NA |? | | | |
215129
|trackdf |? | | | |
216-
|trending |? | | | |
217130
|TUFLOWR |? | | | |
218131
|VancouvR |? | | | |
219-
|vivid |? | | | |
220132
|wallace |? | | | |
221133
|waterquality |? | | | |
134+
|NA |? | | | |
222135
|waves |0.2.4 |1 | | |
223136
|wdpar |? | | | |
224-
|wearables |0.8.1 |1 | | |
225-
|webSDM |? | | | |
226-
|xpose.nlmixr2 |0.4.0 |1 | | |
137+
|NA |? | | | |
227138
|zipcodeR |0.3.5 |1 | | |
228-
|zonebuilder |? | | | |
229139

230-
## New problems (4)
140+
## New problems (2)
231141

232-
|package |version |error |warning |note |
233-
|:-----------|:-------|:------|:-------|:----|
234-
|[dm](problems.md#dm)|1.0.4 |__+1__ | | |
142+
|package |version |error |warning |note |
143+
|:----------|:-------|:------|:-------|:----|
235144
|[exuber](problems.md#exuber)|1.0.1 |__+1__ | |1 |
236-
|[missCompare](problems.md#misscompare)|1.0.3 |__+1__ | | |
237-
|[rapbase](problems.md#rapbase)|1.24.0 |__+1__ | | |
145+
|[modelplotr](problems.md#modelplotr)|1.1.0 | |__+1__ | |
238146

0 commit comments

Comments
 (0)