From ab3792bd61609eaed0b25fb9ba5000ea10b6482a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sep 20 2021 03:20:47 +0000 Subject: Update to latest version (#1990283) --- diff --git a/.gitignore b/.gitignore index 874fe83..1ee90bf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /reprex_0.2.1.tar.gz /reprex_0.3.0.tar.gz /reprex_2.0.0.tar.gz +/reprex_2.0.1.tar.gz diff --git a/0001-Fix-test-results-with-latest-cli.patch b/0001-Fix-test-results-with-latest-cli.patch deleted file mode 100644 index 54d7b38..0000000 --- a/0001-Fix-test-results-with-latest-cli.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up reprex/tests/testthat/_snaps/utils-ui.md.cli-fixes reprex/tests/testthat/_snaps/utils-ui.md ---- reprex/tests/testthat/_snaps/utils-ui.md.cli-fixes 2021-06-16 14:15:54.331899756 -0400 -+++ reprex/tests/testthat/_snaps/utils-ui.md 2021-06-16 14:16:21.413073276 -0400 -@@ -44,17 +44,17 @@ - reprex_path("Something descriptive:", "path/to/file") - Message - v Something descriptive: -- path/to/file -+ 'path/to/file' - Code - x <- "path/to/file" - reprex_path("Something descriptive:", x) - Message - v Something descriptive: -- path/to/file -+ 'path/to/file' - Code - y <- c("path", "to", "file") - reprex_path("Something descriptive:", path_join(y)) - Message - v Something descriptive: -- path/to/file -+ 'path/to/file' - diff --git a/0001-Fix-test-results-with-pandoc-2.5.patch b/0001-Fix-test-results-with-pandoc-2.5.patch deleted file mode 100644 index 8346d7b..0000000 --- a/0001-Fix-test-results-with-pandoc-2.5.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 15b68a198d828f8fb75324ec1efcf61db17559e6 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Mon, 12 Aug 2019 18:38:12 -0400 -Subject: [PATCH] Fix test results with pandoc 2.5. - -Signed-off-by: Elliott Sales de Andrade ---- - tests/testthat/test-venues.R | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/testthat/test-venues.R b/tests/testthat/test-venues.R -index 2fe8d85..f1724d6 100644 ---- a/tests/testthat/test-venues.R -+++ b/tests/testthat/test-venues.R -@@ -9,6 +9,7 @@ test_that("venue = 'so' works with/without leading prose", { - ) - output <- c( - "", -+ "", - "Hello world", - "", - " ## comment", --- -2.21.0 - diff --git a/R-reprex.spec b/R-reprex.spec index b8db126..f72df18 100644 --- a/R-reprex.spec +++ b/R-reprex.spec @@ -1,26 +1,19 @@ -%global packname reprex +%global packname reprex +%global packver 2.0.1 %global rlibdir %{_datadir}/R/library -%global __suggests_exclude ^R\\((devtools)\\) - -# Not all available yet. -%global with_suggests 0 - Name: R-%{packname} -Version: 2.0.0 +Version: 2.0.1 Release: %autorelease Summary: Prepare Reproducible Example Code via the Clipboard License: MIT URL: https://CRAN.R-project.org/package=%{packname} -Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz - -# https://github.com/tidyverse/reprex/commit/725c3a67bcfcec53dcf02db2fa210cfa63168e05 -Patch0: 0001-Fix-test-results-with-latest-cli.patch +Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz # Here's the R view of the dependencies world: # Depends: -# Imports: R-callr >= 3.6.0, R-cli >= 2.3.1, R-clipr >= 0.4.0, R-fs, R-glue, R-knitr, R-rlang >= 0.4.0, R-rmarkdown, R-rstudioapi, R-utils, R-withr >= 2.3.0 +# Imports: R-callr >= 3.6.0, R-cli >= 2.3.1, R-clipr >= 0.4.0, R-fs, R-glue, R-knitr >= 1.23, R-rlang >= 0.4.0, R-rmarkdown, R-rstudioapi, R-utils, R-withr >= 2.3.0 # Suggests: R-covr, R-fortunes, R-miniUI, R-mockr, R-rprojroot, R-sessioninfo, R-shiny, R-spelling, R-styler >= 1.2.0, R-testthat >= 3.0.2 # LinkingTo: # Enhances: @@ -35,27 +28,21 @@ BuildRequires: R-cli >= 2.3.1 BuildRequires: R-clipr >= 0.4.0 BuildRequires: R-fs BuildRequires: R-glue -BuildRequires: R-knitr +BuildRequires: R-knitr >= 1.23 BuildRequires: R-rlang >= 0.4.0 BuildRequires: R-rmarkdown BuildRequires: R-rstudioapi BuildRequires: R-utils -BuildRequires: R-withr +BuildRequires: R-withr >= 2.3.0 BuildRequires: R-fortunes -BuildRequires: R-knitr +BuildRequires: R-miniUI BuildRequires: R-mockr BuildRequires: R-rprojroot BuildRequires: R-sessioninfo -%if %{fedora} > 29 BuildRequires: R-shiny -%endif BuildRequires: R-spelling -BuildRequires: R-testthat >= 3.0.2 -%if %{with_suggests} -BuildRequires: R-devtools -BuildRequires: R-miniUI BuildRequires: R-styler >= 1.2.0 -%endif +BuildRequires: R-testthat >= 3.0.2 %description Convenience wrapper that uses the 'rmarkdown' package to render small snippets @@ -71,11 +58,8 @@ from an R session. %prep %setup -q -c -n %{packname} -pushd %{packname} -%patch0 -p1 # Don't need coverage; it's not packaged either. -sed -i 's/covr, //g' DESCRIPTION -popd +sed -i 's/covr, //g' %{packname}/DESCRIPTION %build @@ -89,35 +73,9 @@ rm -f %{buildroot}%{rlibdir}/R.css %check -# I turned off the check suite to do the R rebuild, but you should figure out the right fix here. -# ERROR -# Running the tests in 'tests/testthat.R' failed. -# Last 13 lines of output: -# -# Run `snapshot_accept('input')` if this is a deliberate change -# -- Failure (test-utf8.R:18:3): UTF-8 encoding, string input -------------------- -# out_utf8\[i_out\] does not match "[\u00c0]". -# Actual value: "#> \[1\] "" "" """ -# -- Failure (test-utf8.R:19:3): UTF-8 encoding, string input -------------------- -# out_utf8\[i_out\] does not match "[\u00cb]". -# Actual value: "#> \[1\] "" "" """ -# -- Failure (test-utf8.R:20:3): UTF-8 encoding, string input -------------------- -# out_utf8\[i_out\] does not match "[\u00d0]". -# Actual value: "#> \[1\] "" "" """ -# -# [ FAIL 4 | WARN 0 | SKIP 5 | PASS 168 ] -# Error: Test failures -# Execution halted -%if 0 - -export NOT_CRAN=true -%if %{with_suggests} +export LANG=C.UTF-8 NOT_CRAN=true %{_bindir}/R CMD check %{packname} -%else -_R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} -%endif -%endif %files %dir %{rlibdir}/%{packname} @@ -128,10 +86,10 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} %license %{rlibdir}/%{packname}/LICENSE %{rlibdir}/%{packname}/INDEX %{rlibdir}/%{packname}/NAMESPACE -%{rlibdir}/%{packname}/WORDLIST %{rlibdir}/%{packname}/Meta %{rlibdir}/%{packname}/R %{rlibdir}/%{packname}/help +%{rlibdir}/%{packname}/WORDLIST %{rlibdir}/%{packname}/addins %{rlibdir}/%{packname}/rmarkdown %{rlibdir}/%{packname}/rstudio diff --git a/sources b/sources index 57cd475..f385d93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (reprex_2.0.0.tar.gz) = c0591bb965f5304fef4a8918d7341463f039cbc817581a5d920931f975aae9553abff99dcf1ad44615665c05f9cfe2138aff0ff7c21d5583f476de68a68674aa +SHA512 (reprex_2.0.1.tar.gz) = f5eaeac1854e1d2bc89e27642fdb65744a305937d781e77e1e57a581c11e6b392e34cfebfc8166d21ad4d68b18637f5d7cf114be4428d7bb40d827fa0ee7ee80