Compare commits

..

No commits in common. "rawhide" and "f30" have entirely different histories.
rawhide ... f30

5 changed files with 76 additions and 244 deletions

18
.gitignore vendored
View File

@ -2,21 +2,3 @@
/testthat_1.0.2.tar.gz
/testthat_2.0.0.tar.gz
/testthat_2.0.1.tar.gz
/testthat_2.1.0.tar.gz
/testthat_2.1.1.tar.gz
/testthat_2.2.1.tar.gz
/testthat_2.3.0.tar.gz
/testthat_2.3.1.tar.gz
/testthat_2.3.2.tar.gz
/testthat_3.0.0.tar.gz
/testthat_3.0.1.tar.gz
/testthat_3.0.2.tar.gz
/testthat_3.0.3.tar.gz
/testthat_3.0.4.tar.gz
/testthat_3.1.0.tar.gz
/testthat_3.1.1.tar.gz
/testthat_3.1.2.tar.gz
/testthat_3.1.4.tar.gz
/testthat_3.1.6.tar.gz
/testthat_3.1.7.tar.gz
/testthat_3.2.0.tar.gz

View File

@ -1,30 +0,0 @@
diff -up testthat/testthat/inst/include/testthat/vendor/catch.h.sigstksz-not-constant testthat/testthat/inst/include/testthat/vendor/catch.h
--- testthat/testthat/inst/include/testthat/vendor/catch.h.sigstksz-not-constant 2021-03-08 13:42:10.853651874 -0500
+++ testthat/testthat/inst/include/testthat/vendor/catch.h 2021-03-08 13:42:36.079767324 -0500
@@ -6492,7 +6492,7 @@ namespace Catch {
static bool isSet;
static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
static stack_t oldSigStack;
- static char altStackMem[SIGSTKSZ];
+ static char altStackMem[32768];
static void handleSignal( int sig ) {
std::string name = "<unknown signal>";
@@ -6512,7 +6512,7 @@ namespace Catch {
isSet = true;
stack_t sigStack;
sigStack.ss_sp = altStackMem;
- sigStack.ss_size = SIGSTKSZ;
+ sigStack.ss_size = 32768;
sigStack.ss_flags = 0;
sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = { 0 };
@@ -6543,7 +6543,7 @@ namespace Catch {
bool FatalConditionHandler::isSet = false;
struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
stack_t FatalConditionHandler::oldSigStack = {};
- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+ char FatalConditionHandler::altStackMem[32768] = {};
} // namespace Catch

View File

@ -1,51 +1,38 @@
%bcond_with check
%bcond_without check
%global packname testthat
%global packver 3.2.0
%global packver 2.0.1
Name: R-%{packname}
Version: %{packver}
Release: %autorelease
Summary: Unit Testing for R
Release: 1%{?dist}
Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{packver}.tar.gz
License: MIT
URL: https://cran.r-project.org/package=%{packname}
Source0: %{url}&version=%{packver}#/%{packname}_%{packver}.tar.gz
BuildRequires: R-devel >= 3.6.0, tetex-latex
BuildRequires: R-brio >= 1.1.3
BuildRequires: R-callr >= 3.7.3
BuildRequires: R-cli >= 3.6.1
BuildRequires: R-desc >= 1.4.2
BuildRequires: R-digest >= 0.6.33
BuildRequires: R-ellipsis >= 0.3.2
BuildRequires: R-evaluate >= 0.21
BuildRequires: R-jsonlite >= 1.8.7
BuildRequires: R-lifecycle >= 1.0.3
BuildRequires: R-magrittr >= 2.0.3
URL: http://cran.r-project.org/web/packages/testthat/index.html
Summary: Unit Testing for R
BuildRequires: R-devel >= 3.4.0, tetex-latex
BuildRequires: R-cli
BuildRequires: R-crayon
BuildRequires: R-digest
BuildRequires: R-magrittr
BuildRequires: R-methods
BuildRequires: R-pkgload >= 1.3.2.1
BuildRequires: R-praise >= 1.0.0
BuildRequires: R-processx >= 3.8.2
BuildRequires: R-ps >= 1.7.5
BuildRequires: R-R6 >= 2.5.1
BuildRequires: R-rlang >= 1.1.1
BuildRequires: R-utils
BuildRequires: R-waldo >= 0.5.1
BuildRequires: R-withr >= 2.5.0
BuildRequires: R-curl >= 0.9.5
# for skip_if_offline()
Requires: R-curl
BuildRequires: R-knitr
BuildRequires: R-rmarkdown
BuildRequires: R-rstudioapi
BuildRequires: R-shiny
BuildRequires: R-usethis
BuildRequires: R-vctrs >= 0.1.0
BuildRequires: R-praise
BuildRequires: R-R6 >= 2.2.0
BuildRequires: R-rlang
BuildRequires: R-withr >= 2.0.0
%if %{with check}
BuildRequires: R-xml2
# Not in Fedora as of 2023-11-01
# BuildRequires: R-diffviewer >= 0.1.0
%endif
Requires: R-core >= 3.4.0
Requires: R-cli
Requires: R-crayon
Requires: R-digest
Requires: R-magrittr
Requires: R-methods
Requires: R-praise
Requires: R-R6 >= 2.2.0
Requires: R-rlang
Requires: R-withr >= 2.0.0
%description
A unit testing system designed to be fun, flexible, and easy to set up.
@ -53,9 +40,6 @@ A unit testing system designed to be fun, flexible, and easy to set up.
%prep
%setup -q -c -n %{packname}
# Don't need coverage
sed -i 's/covr, //g' %{packname}/DESCRIPTION
%build
%install
@ -65,8 +49,10 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
%check
%if %{with check}
export _R_CHECK_FORCE_SUGGESTS_=0 LANG=C.UTF-8
%{_bindir}/R CMD check --ignore-vignettes --no-manual %{packname}
%{_bindir}/R CMD check --ignore-vignettes %{packname}
%endif
%files
%dir %{_libdir}/R/library/%{packname}
@ -81,11 +67,54 @@ export _R_CHECK_FORCE_SUGGESTS_=0 LANG=C.UTF-8
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/examples/
%{_libdir}/R/library/%{packname}/help
%{_libdir}/R/library/%{packname}/libs/
%{_libdir}/R/library/%{packname}/resources/
%{_libdir}/R/library/%{packname}/include/
%changelog
%autochangelog
* Thu Feb 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.1-1
- Update to latest version
- Enable tests
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu May 17 2018 Tom Callaway <spot@fedoraproject.org> - 2.0.0-2
- fix Requires (cleanup BR too)
* Wed May 16 2018 Tom Callaway <spot@fedoraproject.org> - 2.0.0-1
- gotta go to 2.0.0
* Wed May 16 2018 Tom Callaway <spot@fedoraproject.org> - 1.0.2-6
- rebuild for R 3.5.0
* Fri Mar 23 2018 Tom Callaway <spot@fedoraproject.org> - 1.0.2-5
- rebuild for now, cannot upgrade due to unpackaged deps
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu May 18 2017 Tom Callaway <spot@fedoraproject.org> - 1.0.2-1
- update to 1.0.2, rebuild for R 3.4.0
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 10 2015 Tom Callaway <spot@fedoraproject.org> - 0.11.0-2
- fix define to be global
* Wed Nov 4 2015 Tom Callaway <spot@fedoraproject.org> - 0.11.0-1
- Initial package

149
changelog
View File

@ -1,149 +0,0 @@
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Apr 21 2023 Iñaki Úcar <iucar@fedoraproject.org> - 3.1.7-2
- R-maint-sig mass rebuild
* Tue Mar 14 2023 Tom Callaway <spot@fedoraproject.org> - 3.1.7-1
- update to 3.1.7
* Thu Feb 9 2023 Tom Callaway <spot@fedoraproject.org> - 3.1.6-1
- update to 3.1.6
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Aug 18 2022 Tom Callaway <spot@fedoraproject.org> - 3.1.4-1
- update to 3.1.4
- rebuild for R 4.2.1
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 21 2022 Tom Callaway <spot@fedoraproject.org> - 3.1.2-1
- update to 3.1.2
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Dec 29 2021 Tom Callaway <spot@fedoraproject.org> - 3.1.1-1
- update to 3.1.1
* Mon Oct 4 2021 Tom Callaway <spot@fedoraproject.org> - 3.1.0-1
- update to 3.1.0
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jul 1 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.4-1
- update to 3.0.4
* Wed Jun 23 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.3-1
- update to 3.0.3
* Thu Jun 10 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.2-3
- Rebuilt for R 4.1.0
* Mon Mar 8 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.2-2
- apply change from Fedora catch1 package to fix issue in rawhide where SIGSTKSZ is no longer a constant
* Mon Feb 15 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.2-1
- update to 3.0.2
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Dec 17 2020 Tom Callaway <spot@fedoraproject.org> - 3.0.1-1
- update to 3.0.1
* Mon Nov 2 2020 Tom Callaway <spot@fedoraproject.org> - 3.0.0-1
- update to 3.0.0
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-5
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 26 2020 José Abílio Matos <jamatos@fc.up.pt> - 2.3.2-3
- bump version to ensure upgrade path (due to a F32 rebuild)
* Thu Jun 4 2020 Tom Callaway <spot@fedoraproject.org> - 2.3.2-2
- rebuild for R 4
* Tue Mar 3 2020 Tom Callaway <spot@fedoraproject.org> - 2.3.2-1
- update to 2.3.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Dec 2 2019 Tom Callaway <spot@fedoraproject.org> - 2.3.1-1
- update to 2.3.1
* Thu Nov 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.3.0-2
- Exclude Suggests for unavailable packages
* Wed Nov 6 2019 Tom Callaway <spot@fedoraproject.org> - 2.3.0-1
- update to 2.3.0
* Fri Aug 16 2019 Tom Callaway <spot@fedoraproject.org> - 2.2.1-1
- update to 2.2.1
* Sun Aug 11 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.1-3
- Remove explicit dependencies provided by automatic dependency generator
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Apr 24 2019 Tom Callaway <spot@fedoraproject.org> - 2.1.1-1
- update to 2.1.1
* Tue Apr 23 2019 Tom Callaway <spot@fedoraproject.org> - 2.1.0-1
- update to 2.1.0
* Thu Feb 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.1-1
- Update to latest version
- Enable tests
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu May 17 2018 Tom Callaway <spot@fedoraproject.org> - 2.0.0-2
- fix Requires (cleanup BR too)
* Wed May 16 2018 Tom Callaway <spot@fedoraproject.org> - 2.0.0-1
- gotta go to 2.0.0
* Wed May 16 2018 Tom Callaway <spot@fedoraproject.org> - 1.0.2-6
- rebuild for R 3.5.0
* Fri Mar 23 2018 Tom Callaway <spot@fedoraproject.org> - 1.0.2-5
- rebuild for now, cannot upgrade due to unpackaged deps
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu May 18 2017 Tom Callaway <spot@fedoraproject.org> - 1.0.2-1
- update to 1.0.2, rebuild for R 3.4.0
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 10 2015 Tom Callaway <spot@fedoraproject.org> - 0.11.0-2
- fix define to be global
* Wed Nov 4 2015 Tom Callaway <spot@fedoraproject.org> - 0.11.0-1
- Initial package

View File

@ -1 +1 @@
SHA512 (testthat_3.2.0.tar.gz) = 443f2135d042cf7b7b9f6acbf8750cddfad5f026f778053d99aa39df6e2ea32ce5aa35ea033fdb7cfd6613cb44142c6c4c490e1c949bd56276065fbd1a5427b0
SHA512 (testthat_2.0.1.tar.gz) = 41d6e7243fc2bb291980e7bead1a979d461a2d608aa9cc48671ac311bbcac233ca80401f7027405e38d68e31822ec3c5bf2b3a237c0f56a8e9b4d7b1835b2426