From ffb826e0769265aa117bc820a3327707a2ce2deb Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 16 Jan 2020 11:38:02 -0800 Subject: [PATCH 1/2] Remove tests until all the dependencies are in EPEL8 --- rubygem-aruba.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 106290d..3cd2355 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -1,10 +1,13 @@ # Generated from aruba-0.4.11.gem by gem2rpm -*- rpm-spec -*- %global gem_name aruba +# Not all test dependencies are in EPEL8 yet +%bcond_with tests + Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 1%{?dist} +Release: 1%{?dist}.1 # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -15,6 +18,7 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby +%if %{with tests} BuildRequires: rubygem(cucumber) >= 1.3.19 BuildRequires: rubygem(childprocess) >= 0.5.6 BuildRequires: rubygem(ffi) >= 1.9.10 @@ -23,6 +27,7 @@ BuildRequires: rubygem(pry) BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(contracts) >= 0.9 BuildRequires: rubygem(thor) >= 0.19 +%endif # features/steps/command/shell.feature:97 # Scenario: Running python commands BuildRequires: /usr/bin/python3 BuildArch: noarch @@ -70,6 +75,7 @@ rm -rf \ script/ \ %{nil} +%if %{with tests} %check pushd .%{gem_instdir} # Drop the fuubar dependency. @@ -121,6 +127,7 @@ sed -i features/02_configure_aruba/home_directory.feature \ # Make the Aruba always awailable. RUBYOPT=-I$(pwd)/lib cucumber popd +%endif %files @@ -142,6 +149,9 @@ popd %{gem_instdir}/templates/ %changelog +* Thu Jan 16 2020 Troy Dawson - 0.14.14-1.1 +- Remove tests until all the dependencies are in EPEL8 + * Mon Dec 30 2019 Mamoru TASAKA - 0.14.14-1 - 0.14.14 From 038b70e577f20e81de21d02fb28bdbadffad0583 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 12 Sep 2023 09:35:35 -0700 Subject: [PATCH 2/2] Kill python test entirely to redure BR, it is not important (#2237692) --- rubygem-aruba.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index 3cd2355..a088772 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -7,7 +7,7 @@ Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.14.14 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 # aruba itself is MIT # icons in templates/images are CC-BY # jquery.js itself is MIT or GPLv2 @@ -28,8 +28,6 @@ BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(contracts) >= 0.9 BuildRequires: rubygem(thor) >= 0.19 %endif -# features/steps/command/shell.feature:97 # Scenario: Running python commands -BuildRequires: /usr/bin/python3 BuildArch: noarch %description @@ -99,17 +97,10 @@ sed -i features/support/env.rb \ sed -i fixtures/cli-app/spec/spec_helper.rb \ -e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|" -# /usr/bin/python is reporting deprecation warning :/ -# No need to modify @requires-python (in run_commands.feature and hooks.rb) -if ! grep -q python3 features/steps/command/shell.feature -then - sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \ - -e 's|python|python3|' - sed -i lib/aruba/generators/script_file.rb \ - -e '\@interpreter@s|A-Z|A-Z0-9|' - sed -i features/01_getting_started_with_aruba/run_commands.feature \ - -e '\@[^-]python@s|python|python3|' -fi +# Kill tests which requires python explicitly +# (to reduce BR, anyway this test is not important) +sed -i features/step_definitions/hooks.rb \ + -e '\@platform.which@s|"python"|"no-python"|' # Get rid of Bundler sed -i Rakefile \ @@ -149,6 +140,9 @@ popd %{gem_instdir}/templates/ %changelog +* Tue Sep 12 2023 Troy Dawson - 0.14.14-1.2 +- Kill python test entirely to redure BR, it is not important (#2237692) + * Thu Jan 16 2020 Troy Dawson - 0.14.14-1.1 - Remove tests until all the dependencies are in EPEL8