Hello community, here is the log from the commit of package python-pipx for openSUSE:Factory checked in at 2020-05-07 14:50:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pipx (Old) and /work/SRC/openSUSE:Factory/.python-pipx.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pipx" Thu May 7 14:50:11 2020 rev:2 rq:800633 version:0.14.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pipx/python-pipx.changes 2019-11-27 13:51:13.332475663 +0100 +++ /work/SRC/openSUSE:Factory/.python-pipx.new.2738/python-pipx.changes 2020-05-07 14:50:14.933928689 +0200 @@ -1,0 +2,7 @@ +Wed May 6 00:20:19 UTC 2020 - Matej Cepl <[email protected]> + +- Don't use %python3_only command, but properly use alternatives. +- Add test_alternative_names.patch to make tests pass even + with alternated name of the binary. + +------------------------------------------------------------------- New: ---- test_alternative_names.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pipx.spec ++++++ --- /var/tmp/diff_new_pack.NiQvaT/_old 2020-05-07 14:50:16.689932212 +0200 +++ /var/tmp/diff_new_pack.NiQvaT/_new 2020-05-07 14:50:16.693932219 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pipx # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,8 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# %{?!python_module:%define python_module() python-%{**} python3-%{**}} @@ -20,14 +21,17 @@ Name: python-pipx Version: 0.14.0.0 Release: 0 -License: MIT Summary: Install and run Python applications in isolated environments -Url: https://github.com/pipxproject/pipx +License: MIT Group: Development/Languages/Python +URL: https://github.com/pipxproject/pipx Source: https://github.com/pipxproject/pipx/archive/%{version}.tar.gz#/pipx-%{version}.tar.gz -BuildRequires: python-rpm-macros +# PATCH-FIX-OPENSUSE test_alternative_names.patch [email protected] +# Make tests pass even with using alternatives +Patch0: test_alternative_names.patch BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: python-rpm-macros # SECTION test requirements BuildRequires: %{python_module argcomplete >= 1.9.4} BuildRequires: %{python_module userpath} @@ -36,6 +40,8 @@ Requires: python-argcomplete >= 1.9.4 Requires: python-setuptools Requires: python-userpath +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %python_subpackages @@ -45,6 +51,8 @@ %prep %setup -q -n pipx-%{version} +%autopatch -p1 + sed -i '1{/^#!/d}' pipx/main.py pipx/venv_metadata_inspector.py %build @@ -52,6 +60,7 @@ %install %python_install +%python_clone -a %{buildroot}%{_bindir}/pipx %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -65,10 +74,16 @@ $python -m pytest -vv -k 'test_basic_commands or test_pipx_help_contains_text' } +%post +%python_install_alternative pipx + +%postun +%python_uninstall_alternative pipx + %files %{python_files} %doc README.md %license LICENSE -%python3_only %{_bindir}/pipx +%python_alternative %{_bindir}/pipx %{python_sitelib}/* %changelog ++++++ test_alternative_names.patch ++++++ --- a/tests/test_pipx.py +++ b/tests/test_pipx.py @@ -12,6 +12,7 @@ from pipx.util import WINDOWS PIPX_PATH = CURDIR = Path(__file__).parent.parent +PYVER_DOT = '.'.join([str(x) for x in sys.version_info[:2]]) assert not hasattr(sys, "real_prefix"), "Tests cannot run under virtualenv" assert getattr(sys, "base_prefix", sys.prefix) != sys.prefix, "Tests require venv" @@ -42,7 +43,7 @@ class TestPipxCommands(unittest.TestCase if WINDOWS: pipx_bin = "pipx.exe" else: - pipx_bin = "pipx" + pipx_bin = "pipx-{}".format(PYVER_DOT) self.assertTrue(which(pipx_bin)) self.pipx_bin = pipx_bin
