From 66987b989cbfc1d93548411d7bde5744831fb613 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 24 Jul 2020 20:34:06 -0400 Subject: [PATCH] Update to latest version. --- .gitignore | 1 + ...15af514b0187bd47d87e8fd99e17ad1d341c.patch | 44 ------------------- R-processx.spec | 17 +++---- sources | 2 +- 4 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 4e3715af514b0187bd47d87e8fd99e17ad1d341c.patch diff --git a/.gitignore b/.gitignore index e17ae27..4f5084f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /processx_3.4.0.tar.gz /processx_3.4.1.tar.gz /processx_3.4.2.tar.gz +/processx_3.4.3.tar.gz diff --git a/4e3715af514b0187bd47d87e8fd99e17ad1d341c.patch b/4e3715af514b0187bd47d87e8fd99e17ad1d341c.patch deleted file mode 100644 index 3940896..0000000 --- a/4e3715af514b0187bd47d87e8fd99e17ad1d341c.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4e3715af514b0187bd47d87e8fd99e17ad1d341c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= -Date: Tue, 11 Feb 2020 11:47:46 +0000 -Subject: [PATCH] Skip curl fd poll test if offline - -Closes #226. ---- - tests/testthat/test-poll-curl.R | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/testthat/test-poll-curl.R b/tests/testthat/test-poll-curl.R -index f0be69c..dff055e 100644 ---- a/tests/testthat/test-poll-curl.R -+++ b/tests/testthat/test-poll-curl.R -@@ -2,10 +2,12 @@ - context("poll-curl") - - ## To resolve.... --httpbin() -+online <- curl::has_internet() -+if (online) httpbin() - - test_that("curl fds", { - skip_on_cran() -+ if (!online) skip("Offline") - - resp <- list() - errm <- character() -@@ -55,6 +57,7 @@ test_that("curl fds", { - - test_that("curl fds before others", { - skip_on_cran() -+ if (!online) skip("Offline") - - pool <- curl::new_pool() - url <- httpbin("/delay/1") -@@ -86,6 +89,7 @@ test_that("curl fds before others", { - - test_that("process fd before curl fd", { - skip_on_cran() -+ if (!online) skip("Offline") - - pool <- curl::new_pool() - url <- httpbin("/delay/1") diff --git a/R-processx.spec b/R-processx.spec index e0ecfe9..f420c42 100644 --- a/R-processx.spec +++ b/R-processx.spec @@ -1,19 +1,17 @@ %bcond_with check %global packname processx -%global packver 3.4.2 +%global packver 3.4.3 %global rlibdir %{_libdir}/R/library Name: R-%{packname} -Version: 3.4.2 -Release: 2%{?dist} +Version: 3.4.3 +Release: 1%{?dist} Summary: Execute and Control System Processes License: MIT URL: https://CRAN.R-project.org/package=%{packname} Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz -# Fix curl test with no network. -Patch0001: https://github.com/r-lib/processx/commit/4e3715af514b0187bd47d87e8fd99e17ad1d341c.patch # Here's the R view of the dependencies world: # Depends: @@ -50,12 +48,8 @@ with a timeout. It can also poll several processes at once. %prep %setup -q -c -n %{packname} -pushd %{packname} -%patch0001 -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 @@ -97,6 +91,9 @@ install -pm 0644 %{packname}/README.md %{buildroot}%{rlibdir}/%{packname}/ %changelog +* Tue Jul 21 2020 Elliott Sales de Andrade - 3.4.3-1 +- Update to latest version + * Wed Jun 3 2020 Tom Callaway - 3.4.2-2 - rebuild for R 4 - conditionalize check to break testthat loop diff --git a/sources b/sources index 3303f74..7f087ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (processx_3.4.2.tar.gz) = 09e42384946d0298f3eb1914963155fa458b51fccf1e1a142fc275c93a7210f2d09d0710699c8b2e8cbf2262dd0dcc94166d608da77cd98fbeb89e37959607c6 +SHA512 (processx_3.4.3.tar.gz) = aab502de864ab3b3f0ca7bb8b3a5c21bd54e97db85ce024b1e4daab8e48752b87b686a91aa32de6781b59c1a74aaf5aeff36ec3a24be438a5a56df80af68d5a1