From c9a4cf34e7d49891141469c345a2a09f78326308 Mon Sep 17 00:00:00 2001 From: chainsawriot Date: Fri, 26 Jul 2024 16:20:33 +0200 Subject: [PATCH] Rollback nanoparquet ref #315 --- DESCRIPTION | 6 +++--- NEWS.md | 4 ++++ R/import_methods.R | 2 +- R/sysdata.rda | Bin 2356 -> 2371 bytes README.md | 2 +- data-raw/single.json | 2 +- tests/testthat/test_format_parquet.R | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8054570..4e9fd01 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -53,8 +53,7 @@ Imports: writexl, lifecycle, R.utils, - readr, - nanoparquet + readr Suggests: datasets, bit64, @@ -74,7 +73,8 @@ Suggests: qs, arrow (>= 0.17.0), stringi, - withr + withr, + nanoparquet License: GPL-2 VignetteBuilder: knitr Encoding: UTF-8 diff --git a/NEWS.md b/NEWS.md index 3d57f0d..63310d8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# rio 1.2.1 + +* Roll back the decision to add parquet in the import tier see #455 #315 + # rio 1.2.0 * Fix lintr issues #434 (h/t @bisaloo Hugo Gruson) diff --git a/R/import_methods.R b/R/import_methods.R index 6bac032..b922390 100644 --- a/R/import_methods.R +++ b/R/import_methods.R @@ -413,7 +413,7 @@ extract_html_row <- function(x, empty_value) { #' @export .import.rio_parquet <- function(file, which = 1, ...) { - #.check_pkg_availability("arrow") + .check_pkg_availability("nanoparquet") .docall(nanoparquet::read_parquet, ..., args = list(file = file, options = nanoparquet::parquet_options(class = "data.frame"))) } diff --git a/R/sysdata.rda b/R/sysdata.rda index dbdb0b4c41db70b2c64563a9c2e31fdecf892e24..3f6a0226abc78702847bd7da07f159d8e28e4133 100644 GIT binary patch literal 2371 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 literal 2356 zcmV-43Cs3ET4*^jL0KkKSp{5W_5cgjf589$|M%^0u$Vvh{qVp4|MWlr00CeMKYMY+ zxIl0-Ccr3-fvso^g&0XBn3^V@rbd&(dPk87>7g-{V47$#GHHo~Xn9XW&<#}fqct%y zO;1xAMt}eS00000&>8^KLxV<*13{oNVgn;XAOJMeAOHb^00>l2)f#@NL()8^nq&c{ znqgeeO6fXNU7MQtP?(^M#>B7YDAJ@bhLl@^-dsefUl4dO|VkPe6fQ%u zRRr%9W(#~GlgZ+vpnx0V;hha+Avc~E^wZ4q3>t2m4X$QCcG~9?%t;nd;lv^sh;YTu z;iACLT<1=jbX!qHEKF(rEV!yDxUX!|R~zz5MySHwXC6FsbCNaFU3#0~dktxRS_g*A+5AWdxs8p^S;CMJx+ zP!%CUhr|+*9atL#g2Iu7b;;jOjFDZm*<}Q;hRO(g>d}oel^iEFgX3Zei6rj$xbL7^!Gp(zSdCV`@WC``a4 zAwx*HmM{T#Gzc3=7vWiM&YSSv2>azxPyNnMos?@o3u9{y_|(^qb`!~2_EZ;F6{9Rc zgg_s3)zwZ{a_r`E7i()pej=~E#yG4s1|0F36oy(irSyqWt7Xow#>oWYu5Bwh&_pw>3)SNcu5H@e@g(?J$yqo)ciXpem`CwQEwNYwVv?ZvT&REoFt1iNVhG#idzDmpK zDcdfRFQTT5s)!(@EDMm>rmD8`cc~RpUwK{gMaAj}E%qdY6|N|Qzl)FNi(eNwvB7}h zES;TOyvI?k-BTZ&U}||*2jLeXc;F)`oY6*Y1}rWdEZ*o0styU;YuGYwf0tfQ3D8Hx zDmj)y*KhHj5p-WepuC>}+& z$jIx>KE@&oGG#M|Clj6yf~iINs@X$M$Vg4zSFP%(uCa6#5dQ{|?wb&z5= zgNS_pPVvU63fUk^k)=hpiqQK1x&0~iuPBQo446D_k_t)*B#Xp)gkrO3U#ut(23_0n z?)s57y3!3_MdrgSMPf0GP*Ci$nItIk$VY_V6Ua@;p`nj5qwLgQN{=N&cNfb0il8C8 zf#!jr{Wz4u*oM{SqZaI}l*v~{TLr5l6@+O8>9YM3eJ#h|gB}_WM z@vM%oRoQ(QbceuZ4n$)?T0Of|$!0s$grZSQLkTp35FxM#m1k zib}3S`33?xD=|l6u65?fG@##FYlfn#7an$Yzw7S4M<$dfqJd15QxcO-B8qYMB9!w~ ziAtg@APN$YC}JTZ0)~1F@FZ9y1&mxQA8>d~Uy>>>xb_f<2#1GcOhxGK!5?kFA8+Dm z4#KN(NGv_@mct`rCD2q?w;<76G|A_fO!O9|BRXx2ZLwx%aDwPHwB>>ajio4x6qdX~ zc;nD=G$yT}W(_N6m_aBwluI_K}8xhK-?K2 z^p}`eH4+hLNG3!9QvL${2hjgJ3D84d_X&XDH(}AoEHv~SyJccg);*}aL2FAs7Z<1b=#xp`Sg?Z{L;3mUc;~^vF@gtdTW?-nKZKYk82h`T} zoa%kYCZ%dgrAD5AKEzTkZw7H>CWWOxvl8GL%9ODK+MS#_}DV=^XDl&-(C(vP#)qCNb z6R4P&dtE-q)xlk*J=PR~%x6TioCu>i)z13C;ndq+NKvOxVOh$w;3e)hFl|Ty=wZ(7 zQ;oyLI45Yle^8BE1l9<|Hl{iHb8r#lBx)&J4lqdh(fdZaOFprb)_k6*F3aA;A(K`i zTjWZ0dFm9N&6S5Sbx|+u>ToVm){?6mFMAD`FyVq!~Xb7dvUM|~lr6pV>gR%1xe{(qyt;YlLYFN(s#S~VL^ zMq-0=DMA)BISQXy^4gGFlh`BGpq5;|bX|3}ob0b5cZVdvV?fH8xgJU2k067yhk=X)5HxQ~ z71`62$aAu@0wP%HTjpr2JnRNwDQGBjj4{IwDw@fqMWMPgnA=ifw9wgr+ilR-8g8p$ zoEf-jwAj-G8PmRoBy#$zJlr%1hE!-qy*WiuLw4}#%8{&SL6{S-X1EIvhJzGk)nYhT zJQs-WF-cw(qj1oB!q=zWMt%XL$whmu8!mb?2V#_GyQwRL9^JRru13Z3beuIIgZN`l zzG|0Afy2@DCs=v-BD9d=P7LbAlGX$b} aw%pAvhz>StX72Y<{}*yaI8cxUTxIrwVLcWA diff --git a/README.md b/README.md index 0487f54..a9d2aae 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,6 @@ The full list of supported formats is below: | Gzip | gz / gzip | base | base | Default | | | Zip files | zip | utils | utils | Default | | | Ambiguous file format | dat | data.table | | Default | Attempt as delimited text data | -| Apache Arrow (Parquet) | parquet | nanoparquet | nanoparquet | Default | | | CSVY (CSV + YAML metadata header) | csvy | data.table | data.table | Default | | | Comma-separated data | csv | data.table | data.table | Default | | | Comma-separated data (European) | csv2 | data.table | data.table | Default | | @@ -160,6 +159,7 @@ The full list of supported formats is below: | Text Representations of R Objects | dump | base | base | Default | | | Weka Attribute-Relation File Format | arff / weka | foreign | foreign | Default | | | XBASE database files | dbf | foreign | foreign | Default | | +| Apache Arrow (Parquet) | parquet | nanoparquet | nanoparquet | Suggest | | | Clipboard | clipboard | clipr | clipr | Suggest | default is tsv | | EViews | eviews / wf1 | hexView | | Suggest | | | Fast Storage | fst | fst | fst | Suggest | | diff --git a/data-raw/single.json b/data-raw/single.json index 6aacab4..6bd293c 100644 --- a/data-raw/single.json +++ b/data-raw/single.json @@ -2,7 +2,7 @@ { "input": "parquet", "format": "parquet", - "type": "import", + "type": "suggest", "format_name": "Apache Arrow (Parquet)", "import_function": "nanoparquet::read_parquet", "export_function": "nanoparquet::write_parquet", diff --git a/tests/testthat/test_format_parquet.R b/tests/testthat/test_format_parquet.R index 49739ef..b11a77d 100644 --- a/tests/testthat/test_format_parquet.R +++ b/tests/testthat/test_format_parquet.R @@ -1,4 +1,4 @@ -skip_if_not_installed("arrow") +skip_if_not_installed("nanoparquet") skip_on_os("mac") ## apache/arrow#40991 test_that("Export to and import from parquet", {