From 7054911fe9ee117672a46c6842811cea9521d6d9 Mon Sep 17 00:00:00 2001 From: chainsawriot Date: Thu, 19 Dec 2024 14:25:22 +0100 Subject: [PATCH] Fix #207 --- .Rbuildignore | 1 + NEWS.md | 4 ++++ tests/testdata/layout_test.xls | Bin 14336 -> 0 bytes tests/testdata/layout_test.xlsx | Bin 8595 -> 0 bytes tests/testthat/test_issue81.R | 4 +++- 5 files changed, 8 insertions(+), 1 deletion(-) delete mode 100644 tests/testdata/layout_test.xls delete mode 100644 tests/testdata/layout_test.xlsx diff --git a/.Rbuildignore b/.Rbuildignore index eefa2da..780da5b 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -24,3 +24,4 @@ notes.R ^revdep$ ^LICENSE.note$ ^.editorconfig$ +^tests/testdata/issue81.ods$ diff --git a/NEWS.md b/NEWS.md index 3948728..52a521b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# readODS 2.3.2 + +* Fix #207, trim off large or unused test files + # readODS 2.3.1 * Undo #173, use `cpp11` like 2.2.0 diff --git a/tests/testdata/layout_test.xls b/tests/testdata/layout_test.xls deleted file mode 100644 index 912829df08e741a618466860b23330fe4b727672..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14336 zcmeHOU2I%O6`oytcklXdf89W;L`&MZ`Ejf!c}Nf{asK+JG>y_!yi}sLvre7ZaTGhE zc>vtBm3SahQKj+{302AiP(eXdAOwiyjfbKlq)LIO6nLP52N!`*rKINjW_Ehcxrq}y z1n7p`)y%!;oVhdKJ#*&FId^w|^G@aR>pxuio=Y8{a~fUzQT6g?&{7Scb*>jk-hu(9^AR_viGd# z-9Hu@zz~lM4e|-w^Z&jyKDBeb_KWe^>-E~-x%~6cX@if~I-;I820hHD`RfSF`I#&1~J{L0yigSm~X53%gQSS5eqipE%^Xqs*5WqNr@d69& zkA?QbbL4Gx-SdnKeu*d|aW7;LM_oIOGct8zvI$}rgw3fF zv!`*r8)Xm5UX+JX9zl5&F!%55b4eEcZ#jOrF+&9n4Gnc*8>7w;vY3I#rl*fhG-o*W z0^*>GdkqiIIA|>CN5Mtw@an~NmcdeRs%7I;d!VAjP$#FT;?-4#Vy=AWgWo1i^gFQoz{rtiW8lDxzS&E@ z9zd5{{qg>e2h{aCT#x%>e#d%s{kmHNfQM1|IpYR1gPC}LJZId~=)22(*=xeN?^PKM zI!|Z7J6aGLvz+-_cc5LCkz+R{9# zEzRT9rg@BV(>!j0X&xsz&0|!Y=5gZFJVwpHZ7{c@Xv4#O*W628rTe2E)4bMNGW~H4 zrQ2~erg@Co(>zA;ns?R5{~_XcjueL~`8rS;Z`MJ^St@xi@C&ye&rTUNUGlw@;CFaU zEG3^mmaqf!dbO|D_n*5z{MelFlJ`IyyTkX-*$q?{GNC#Q)oG}lq4I_* z7%DMT(NJB6>NZr5qG*#r55(E&QPb7}MbttOwNOMY6j2LB)It%pP(&>hQ42-XLJ_r4 zL>(z=66>*rGiOleFt@s;MxDbGYMDlzgEeTGMxDc0TBcFwpf@eksB^Flkp*kx3Z-@# zHENkgornEsnMR$59ch_Hori|BOry@j6Kk19oktd}Wg0bg9@Yp^7Yyox(RIO~<|ZJ0 z77Xfw(RIO~E*M=G4C;c>b-|!67+upgO8(sdQ6~m_>=oS}b@b4j0of~h zyzF-F71WjN6}`THdScpYuh*DR)ELJOGHOgHdV=T$d%eblqQ;`H>Gc{DiW=jrg+A#C zgrX;)Zi0-SAW~t6jHCB?)a0=xGuW_)28yUfM$|$PwNRXAp@>>2&a+TNEfi4;MbttO zb)*=Xh?Y3xTBcER#m3db={z@ z8`O1!n(3$RQ`>djpspL#b%VP8G3vj%1L!Y1|0s}SmCVz_`jiGP8XjZ*LH|UZ{vAZd z73V|V2&OualluGc5I~Ms1=*_mv6m04R;$?G3JlBvR^Zdqa|ACTj&Q`*fwYBhR7ufe z-vQ}7pOvpqmyph1lddy0^C_WE&3TO^-=v!)Pz;ZWU^?|}hjd-1zI+uyJ4rtW1B-M! zI_EU+f03>eGharfv8)2mxwU?d9A2|9fZ$QWCj=K1mHd}_lyUwfa0`h%d6b1DoHdjD zkc8jPz>Q&<1a2W+jzME5kV%r?>D`ye7)%JoU_vMc6GG8_2}SoM6t`uexGf9CZCNM= z6OrOs!p4v;i%g@=8Pp+NmX;cINS8&XQHOL{WEyoymqn&ghjcm0!o0c%>pG;%BGbAK>9WYQu0y&kGOg>7F2_(iq|32oNSB3TxG9uI9nxiyY1AQI z7MVsJ(q)lp)FE9KnMO@5OW+pL<=8T$%R*_?Azc=kwvdo6i%eTcNS8&XEhMDNBGVQU z(&Z=%>2eI*+ACd-Nq&2!%iLe+XG6LiU&nQO&nFZuL@3&|P_z)CXxBo~LWH7S3q=bN zigqm&Ekr2Vb)-Tf&;5g_Ln0rohtDEOen`S^=U%~mSN4jKF2}S!q{~84W0F`?V?t45 z(F^wZP**5wEczOJd1NSRET;8+xY86g7S~Om4|O9I(&adMd!@@!FYT2s$N6iobU9j9 zd!@_K%G)blj(bHrq|5ZPjPfPP???J233tH92x}&A{d@{6c@d8@Oq^Wq#ZL;-*VyHeCwe_Q&h^ zZ9lbitFH&3;?|+3_dz|qSXs-SUflEX^m3nc!>v(x^6zjMF%vkW+-&wH)2nX2d#NPIWW1BcIzQ&v%bIQv(^yZU>?aK3y3`8*1DikDEh23|qoIyi^IweW2eu7|f!82ny9;ktMm zg#p?n6ox#1LSYawkHRsops@eWHT&nUV}?=O@M~uu|8729lg2UZ z>rnCfkNbZ5?2fOz6Ng_^f9yB=?yuiHH*|0L)o((7gCBl>4|us0?-}s$qdEUP?6i!+ zd-=?Z@gcr@d_pvEJAeQ0=Rf5`uJ@Su#iyI2k>L0O{(W%L9do1pe+b6{a~UH{ zxAb94xs~nzJP=xD+-{6K1z+$aFdSXV?WPUKr|;m{JdE%L#A7X42IEe;<_%ijSi~3g zVdPNXxOI^7`S}eYkDPnTox<}^;TP}x@5f{K7s$Au6LMzpOZaJU7C+Xt#;3nr>hn`y x+glze=k{QPF^{3?|ADeRJp8@?a-W|*e0K3iTDD}lCrdwzSZz1F*aO0sb9xG>1b$S_Q{vtlqm3F`fKLnkvEXI7Sn&kqTs zGH~pep$9$@ao+BAcw(m2tzl#7Qa=7EpP)uOsceLJ7BjH-x)0-8u^^Ia{_|zK+%iJqIRNl8*fFH=|qmCCo9iL9IF}rQKDqG1Mtj1m_zN0(ItVK$eJw zwj{`J4_QukjMG|*z$nQgA)A*5)_=MG+XApK_s_or2J?P|slADklf8p8tC52Pi-)aE z=9rLm7aJzxm)7>qu=jPi3n^6n=*$JGIV6h{!^IPP%9X-#BOfo%)pad7+*`b3L)SL0 zd*tQ`MW;sUO!e6k0^TWDdD{$F-zC~h;VWxV(^%wEKMgZoSvpMqA_zZ)Sxq%Jmw=PE zqWo;*aa5RigsqIk)2I%v5K7mzVroHtKB5XK+1_U;sDbJ^PIpKNhK}yNcX@*Y2X|j} z{SF6qJr0!QT3?LW*6%Wx@wM7rw4Q^KU{&Fk0DkZuPzo#kL~(VsvY@(Sju!j0+>+|_ zAd1$T$Jkc-99ZV!tccz>5BkXe!i&}`Z7>h3R{r{oQ#-w2Y-sK7(le$=FVh7? z{Lynd4P}E6@R(p+#%u@0$8KgDn_Ad`(sS}z@fe|?PGzWy7K0Ab0i^azAZ)f+{Gr+$ z%HFFATocx_oW{}TM#c@+nVS?zklv(7G6OgkWbM~z0kWjL`@tn7(OY?m#%iB~tPuln z37(C;4(#(xTJwA1KMCCrrbvy`39b%q-r^?S25C~xx$4ghBXXT(uN~CS#u`njr9#W# z$u(pEM0Pu`G7U1CNYJUAvd?jC%*FEV}Y&v&o5{iYeIEXFuIX=VvF9Jv)f-|W^IMhj z$_Z%Kt=-+B`<0#=5qBeDpD)wXRT0DUuca@$qAa_yy2n;Po=)Q*COV&5YCZJpP4K+c~b%cq_^%XC3!;0tx6xArWVd|p;%7hlDqZ!-;JNyE)cyv z+w>88%Bm$5)Axvv{>=^>!^M6z81AUb$5Z}VQPI0D>@fC=d*YWi8Fr-V7Iry4r0OR2 zPfqBY&{F!!v2c<7S0bieV7=2fC%P`fFhO|Hcwg|d4$A*)e}S{Aa4hp>4#bI^;q6aIz`1M8B2J_ zHEeoA;=Txd7U4uHZwI<4h-DHu(ceyv(M5B7Hu-cOk9w=ou952*13%1!xR1(nFKo!0 z_gf?00v1owN$6t2D|5OAW_Wvi=9*%1T|0CaA9+w~XB8&PIp)$^$(8$vvyO1ecrh<~ zYsn|z)vzc}6_i`7$72+pQ<+kED&tBw&nJDFr6z(a%$Xc9?5kU)OCzvgXEJ#Sc@NaG zH-<60#av?uSs>Uq*6MR0>w5J>QF)l<%Ul$n&N7fRctyg&J7@Lah<=JBZ_!yxwE9*h zLIEU{jMuXqvd^QSrKsJ1&gYmEBT)b1vtory;Lv!T-eW$wl-Le*tGnWt_3bDZ2ekc0 z6$w!JZ55DSbX=di)%=-6@ z^I520>W~800-+c^K%OxxkTMytXEUucN!>Pap%SvV|i8ADF0ScC}WqKqbe| z%2*M&MG)?$GHe^*qjdCVK6<+v&>tdjceja~x6@dE%dvPSx7{Y5S~BC7`Y0WNP)yVZi%v;r_2u7}sy$ithjS-~kWa7TG+ zZHmP&PeYWabXPq6XO)YNLxjsFWHl_7DER44*G18JoR*G>9Gjj_ku)^L_$x(au-}MRJTmMUh}?)qJkIefY_uoLhwZ)NXNG5% zQ~WE66H))b`KoKr323&t*s8NHFK412$J>^Igm5;4!_=wyVq_Q%jz$(@Y@}0c$T3z?x0V zbJetVI;#?`T#TT7A0)?=3PI0wWXAK>f~)>`Ef2Uz#Og~Mm1dp#?$|am37UNE>(HQn zfHv;x3P-B@Fgm%qW$zNdO=dgOm?p}YHxzbSvhkY{{cJCPQ4`~Fke^_2A+YbtTc1@o z896Ly>CI>~r~ljjmv+jJzDIA;!F<>Z5Vb0!mwd{I_B{idW6vbs>6Afq`qI1R36Iy)t+RA%s}mIEL&FL z+$$>~fTk+WGRN8FROW=)dxA2=lnsHjr(~MY^QCi@`B)5IB|@jr@f1d*zac>DPK(!L31jb{;{QeqFLP&dICS$aX{8j6qPCZ&zf8bKb+#vTyjaJ!{{@7_65!-!AwOiRS3PuO zriMoy4%(Dou;C(%waB;4*z^+U3dQC`(l4LHW8Z#LPwly+ppw7@(Y~0bVP^1Qx7YAs zs&!4921i+Tb{h0)i_f(__oYw-LshuWcSld+(OOnWnK$#h(w`nvnKAyQKQ2?%HYxIq zEN_UNHu{2*x_o-xdXIY;=juvpBJKT-IqL#n?VDGIwrB9oOc4Gcg;W}&G@KVY$<19~ zvQJ#4Ig|Hr1QL#k{6Gn$NP{P4UB(y#O~MM=eWQw0CXpa;^`|b#$Q*;B{endriG@@@ z|FRi(Y`_P}q4Pr_?<4`CZvt7Bd{!T4wGx=t1ahny?S$$&zRS$|DmD4&^bjtHm46!R@)+7Bs&4^pxXj|tv>i%cn6q(IS+oZrgI$m7$mx1TQc zL$`3{mk~a^+&zC)oennEc9?rycgV83FbJEjx43n1;OQR8=Y3XsIp|Ii8M$MV&tsJk zH<@a`c5rh^qk6`%LB)(ZK_lX1DFhu(U-YKvE0|9X(X6{gn;UUL)_PjN zKUWvn(f~~rt7x#d`R3N{m6tW5Umt8_7vFZK zj7WNul3({3^CQ04MvXdH^COxQL$@hJ|L!!`!Lrd2 zMHO>?n?bpPM68${1N=^9W`I#(Cu}ep3KA|0ouJZ14)RN^z~?(SnQv3k(pfp_SyoLv zSy9;yU;b`bBk2o6NI?VeF7UvNViT24PDv}L0*wAww3I!dCg(xT`xL92EzHMpzCu1;`fe zCC%f52=O9}s7lrXD-+QByfp6Y4h%=bL84)i6HK{ad;A)^lWK>0>4dQ1g;ht7G{WV) z`*Oe#2vIMa>kDi_U>KeZ0+wtd%JUgIJh7Vqc|bQqL7-F##whUkFEcZhl)fCJbxg@K>C;bFr+kn9PmB{K^=XLh`5+$UtePRK9IK z*0CWA2Qg#_qbR_%kpos@_DT>S8R-EJF?%IbV2nh8;aBoJAVe0MXAWknfOWaR=x{dt z&N<{Y@~B8Q(#{KH9CEoZHs$th^N9{>ML38jLs*7%1v^%+C;^cXG0+jK_Z0z|5iIaA z7R?UNlH9Wff;Z%)xeSyA*uR^tp3g$i!97OLA5;ovpe)4hOhGoGh>B)I?`%L`qlk)S zyI(vq&S|gQld zi`GW*)XmdZ<26~i9Mh9aV?K=+yajIN0O+@r9Ed zb&*05L&=HE8Qk(;)*^S)ceisnZ(Ot|^Q?BhW%iHOm@E3WEOH5L(l!;=2se|GcyG7| zYjh*fXHSrUZOw#tFAa*!)Q?B@6`S{*kKJ1L%I>_joP_mAy~|vq6|a?ESkseR3n@9D`(xPd{35xJ{)%$*2RqF-?~^cB9=hzpJ6rFQ2#C zaINm3FFaojrK&tDdaL)zDxqc%8fmy@dw5-SdF3d~AMHFb;!7@Q^TG3SuAyuAa!U}~ z&GUvRx~KgiJ6a4o>dqm;ze`H7Ye`m*Zsr&4B4MmCQTAsnKVjj}g)~)mqF`nh0 zSKC92j2A~>XNm&zw)?%tXvY zj8P{pBU^jIiGn3rAmbZz?&i6=5vhdN*NjEd5;ox4hgJCH~?$K3;vS=&W&D z6LpcLLf>$K&glwNJ#!g6cX4yvB~ZPa_Eo%M6n?Z>R!qb5b$(g6Z^Pynb5-bf^;>1r z`@AT#?wNh9o<_BPGB|ta-iCH3FudE&c*asimBk}J7f~(`>8-~xc`Nj6#Q>wvwWYn{ z_|$h-xo^f@lc%dXQ?k9`)WO9&?7EQAVQt5aOK>Sy!3C7cuW$b8>wFDZ;KTdux0NLX z`aIHtOBZpbd_W1ZYG^HlEJmR_znV;i@4X7eWN;{grUr}bWa3!HpSw_N3J+?H?V44`0hK@;T zF2~{JYG5Z^Fh&FnE(KklY@Rx6{q4-q2khh%v&&+X?I9<06dYW9IvXY490$N^Kqrzo zOavzGIQ4jGvSa%xhsM{0HUyDUQOMJO%xx^;8m)_`x~%RpdJ`i3_Y?0T{B~ZD@2*)M zw1VZ<uzLc6JAaV}M|2 zDCF`Y!TQ2N?v!W^B=Z2@2_`l#JE><5k`w;A2_$0s(r%cI^z(pqh$&LMx7_^?vTm3K zC#xg(kGdfJ5|B4YU&2noEj8PPHacqogt(Xu93ZAKMDVcxHmE&fU5O7v{2IAtzck(yXAA7|JP>pPWj+njT1Q8ly)F95R9bZQ}+P(}r@ zv2=PMuTjeRvr%-4CCfJ_dhKV$U@lFvRV!s|SZ}5!leEhyTy|ljX zCi20D-?XL}X|D&o$7t4)5*u3PwSO&^oLE)8_R-PTN7YhXFYbu?7LbOuRt@-WrlTPj zrR(?kyomSi(EU zK^I%qc#HV^>^OXLLZ4r*-EwipuGj`qam#o=o4_HQu5K8|ls;KYuv*^T;Hj{~Y|H0x z>60RUm17ubA=nZ&IT(mv;!%0Z<_eN(R>)2Q4^jJR^Oc>81iNVY%3xc2U!ilRPf%IW z{AJPJxBGR}^Y(Df#X;vOc-}`*Y)a>L+j;MdwkYUW>SFb_x5{zuS$D#o?n1?#wT%Pk)?r`xMZW0SA7o_5<3i2MY=RHqg$JxeRVcpDDWSGN4{rUU!nx?64NV!(KzW;t9M>aN{QW{ z6$Tr5PHw}KacCR}!Z@ka9Z;xZx#Zp}O=nK^F7U5w;|QEi?w$`P>cWxl2oN)95IZ6YQf;G|1X0-~HpjGwD`f?o z76LXX2QM>);6*^E`#%0GpnBF1#Yhfy@6QW&rH1`+5z03wM57q2DD|c&gi2UU6?kCn z6S=rJP6;6!Y~*Dx6Qz3$U~ExSQ~-EW)1;nV&lwwUjZL>E7G+)$BM1sHsxZB@0riXN zu|64fDNOOu>*up3dzBV3gZP!h3w$_e+H0KhIs7DPK%(%*H4CwMv*fTbwHUHEJhj7p z!D}9Z#Cec1e`!PViTHo7@5bgXEsE`l`5z4$3HRQmuL?KvU5}c#?4K^_Zwj1We1yzi zm>tb{&W?)c+`+hel}np_gDa8Wg?Cpo72z(r`0P7&tguNc(~E{POvk`&v)*ZyS^I)L znPYSyf`j0ktxwl@jP=evGVMeO#H>`Hq9&#;%fB5ju>kUFQ}C_GE{lOWit1 z5eWd>v`?x-dW{{GFmUDb{lFkGr>=QFtqfH==yAU&(X1b%p%NA&tO>Z-pG_BBUAfMR zBB?iE%gYO&#dWr-=<7ha7JYn`Tn)bo@U)Pl7&wSo@=%)C$^X<Vrq0QS z;!@0>){Sh~LSMNHNicoH!sI*RX<@GDNVPZ%0^rg_OO4{#hC=*?l)WamA##dnVpNFnx})Av;IS+Kb$x&d(RH`uAFNow#cO0 z28Puv1bxXz<r9Ej;^7v&u5E*M6?T1HjUAEM`TcKKE%qh_N2Jth260BiBA)V5jeW z4p-D#X{R3^x*_jNzgex^xQLJwWlf@<7sIY6E!`BNpu7sl+otXLU2R=cZz#tle}=qh z?J#(1S=@m=cHq^gL4n>}?l@-LUfpQ`^*W`fY?YK^yng#*>}qTV;LIC5zU)Qbm$ACCPP}D5yNdOhm(-J$(k#Y?UIB!9BCi>SyGH^5)HjfFIiTh?qjd*Xy ztX0UQ7wfLa+dOQtTI{h;d3ry+F2xIMjO}k06CveBfHx~f3|st&bYSlUp7ACbfbxns zCb{1Q@D<)s^{vM`DJ|AI9QAC;$EI|wn(%I`9BI1@HVOHu4MO|)yb&JIKiM7B7P?2@ z0^uRl9>L;IOY80=paf95eCINcvYct6#z4DYYnKl5}CT;~rFxjz&B zqy2B@^H=qs*{cUK?}udGd)V)(y(i~s-t diff --git a/tests/testthat/test_issue81.R b/tests/testthat/test_issue81.R index c2127ae..e62de75 100644 --- a/tests/testthat/test_issue81.R +++ b/tests/testthat/test_issue81.R @@ -11,12 +11,14 @@ test_that("issue 81, correctness", { }) test_that("issue 81 real test", { + skip_if(!file.exists("../testdata/issue81.ods")) file <- "../testdata/issue81.ods" res <- read_ods(file, sheet = 2, skip = 4, as_tibble = FALSE) expect_equal(sum(is.na(res[,1])), 0) }) test_that("issue 84", { + skip_if(!file.exists("../testdata/issue81.ods")) file <- "../testdata/issue81.ods" expect_error(read_ods(file, sheet = "Leavers"), NA) -}) \ No newline at end of file +})