From a55ad09f01511bc03dc5ba59c0ffc13008adc753f48829de9d66fe5176c6fbac Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 31 Jul 2023 07:03:05 +0000 Subject: [PATCH 1/3] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pexpect?expand=0&rev=70 --- python-pexpect.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/python-pexpect.spec b/python-pexpect.spec index 229ccf4..a66788a 100644 --- a/python-pexpect.spec +++ b/python-pexpect.spec @@ -28,9 +28,10 @@ Patch0: no-python-binary.patch # Newer asyncio / python 3.11 support Patch1: https://github.com/pexpect/pexpect/pull/715.patch Patch2: https://github.com/pexpect/pexpect/pull/684.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module ptyprocess} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} # For test command calls # For bash validation BuildRequires: bash @@ -60,30 +61,31 @@ find examples -type f -name "*.py" -exec chmod 644 {} \; sed -i '1 {/^#!/d}' pexpect/FSM.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check export LANG=en_US.UTF-8 +echo "set enable-bracketed-paste off" > .inputrc +export INPUTRC=$(readlink -f .inputrc) TRAVIS=true +# test_pager_as_cat - needs manpages that would pull extra deps +# test_interrupt, test_multiple_interrupts - hangs under linux-user emulation # test_bash https://github.com/pexpect/pexpect/issues/568 # test_large_stdout_stream - random -# test_pager_as_cat - needs manpages that would pull extra deps # test_spawn_uses_env - seen failed on s390x # test_forced_terminate - seen failed on armv7l # test_interact_escape_None - seen failed on s390x -# test_interrupt, test_multiple_interrupts - hangs under linux-user emulation # test_existing_spawn - fails under linux-user emulation # test_existing_spawn fails on s390x - gh#pexpect/pexpect#750 -%pytest -k "not (test_bash or test_large_stdout_stream or test_pager_as_cat or test_spawn_uses_env or test_forced_terminate or test_interact_escape_None or test_existing_spawn %{?qemu_user_space_build: or test_interrupt or test_multiple_interrupts})" +%pytest -k "not (test_pager_as_cat or %{?qemu_user_space_build: or test_interrupt or test_multiple_interrupts})" %files %{python_files} %license LICENSE -%doc doc/ -%doc examples/ -%{python_sitelib}/pexpect/ -%{python_sitelib}/pexpect-%{version}-py*.egg-info +%doc doc examples +%{python_sitelib}/pexpect +%{python_sitelib}/pexpect-%{version}*-info %changelog From e570cc123a2e1c5037e6feb3a91a22985d0d54a9e35bce8fa60fcf004b0e4c9f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 31 Jul 2023 07:03:36 +0000 Subject: [PATCH 2/3] Fix changes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pexpect?expand=0&rev=71 --- python-pexpect.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-pexpect.changes b/python-pexpect.changes index 71a2d1b..0d9bb3b 100644 --- a/python-pexpect.changes +++ b/python-pexpect.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 31 07:03:10 UTC 2023 - Matej Cepl + +- Clean up the SPEC file + ------------------------------------------------------------------- Fri Apr 21 12:29:14 UTC 2023 - Dirk Müller From 82ebb8434a4bbe69df782a248b3601ccb129f5753a55a1eeeab81b68c7ab661c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 31 Jul 2023 07:09:16 +0000 Subject: [PATCH 3/3] Fix -k expression OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pexpect?expand=0&rev=72 --- python-pexpect.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pexpect.spec b/python-pexpect.spec index a66788a..6068f5a 100644 --- a/python-pexpect.spec +++ b/python-pexpect.spec @@ -80,7 +80,7 @@ export INPUTRC=$(readlink -f .inputrc) TRAVIS=true # test_interact_escape_None - seen failed on s390x # test_existing_spawn - fails under linux-user emulation # test_existing_spawn fails on s390x - gh#pexpect/pexpect#750 -%pytest -k "not (test_pager_as_cat or %{?qemu_user_space_build: or test_interrupt or test_multiple_interrupts})" +%pytest -k "not (test_pager_as_cat %{?qemu_user_space_build: or test_interrupt or test_multiple_interrupts})" %files %{python_files} %license LICENSE