Accepting request 703184 from home:mcepl:branches:devel:languages:python

- Update to version 19.1.1+git.1557777841.63878672:
  * Update news file to match usual style
  * fix-5963: assert error message
  * Simplify CandidateEvaluator.evaluate_link().
  * Fix 6486 mac gitignore (#6487)
  * Store instances in the VcsSupport registry instead of classes.
  * Remove unused cls argument from VcsSupport.unregister().
  * fix-5963: Add news file
  * fix-5963: fail elegantly on missing name or section in config set / unset
  * Remove unnecessary slices.
  * Fix typo.

- Switch to multibuild, so testing is separate from the building
  of the package itself.

OBS-URL: https://build.opensuse.org/request/show/703184
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip?expand=0&rev=66

python-pip.spec

@@ -17,11 +17,16 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-# NOTE(saschpe): git invocation and pythonpath issues with testrepository
-# enable testing with a build conditional (off by default):
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
 %bcond_without test
-Name:           python-pip
-Version:        19.1.1+git.1557521541.a731e7e3
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name:           python-pip%{psuffix}
+Version:        19.1.1+git.1557777841.63878672
 Release:        0
 Summary:        A Python package management system
 License:        MIT
@@ -76,12 +81,15 @@ rm src/pip/_vendor/certifi/cacert.pem
 %python_build
 
 %install
+%if ! %{with test}
 %python_install
 %prepare_alternative pip
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %if %{with test}
 %check
+export PYTHONPATH=build/lib
 %pytest -k 'not (network or test_config_file_venv_option or test_build_env_allow_only_one_install or test_build_env_requirements_check or test_build_env_overlay_prefix_has_priority or test_build_env_isolation)' tests/unit
 %endif
 
@@ -93,32 +101,22 @@ rm src/pip/_vendor/certifi/cacert.pem
 %post
 # can't use `python_install_alternative` because it's pipX.Y, not pip-X.Y
 PRIO=$(echo %{python_version} | tr -d .)
-%ifpypy3
-%install_alternative pip %{_bindir}/pip-%{pypy3_bin_suffix} $PRIO
-%else
 %install_alternative pip %{_bindir}/pip%{python_version} $PRIO
-%endif
 
 %postun
-%ifpypy3
-%uninstall_alternative pip %{_bindir}/pip-%{pypy3_bin_suffix}
-%else
 %uninstall_alternative pip %{_bindir}/pip%{python_version}
-%endif
 
+%if ! %{with test}
 %files %{python_files}
 %license LICENSE.txt
 %doc AUTHORS.txt NEWS.rst README.rst
-%{_bindir}/pip
+%python3_only %{_bindir}/pip
+%{_bindir}/pip%{python_version}
 %python2_only %{_bindir}/pip2
 %python3_only %{_bindir}/pip3
-%ifpypy3
-%{_bindir}/pip-%{pypy3_bin_suffix}
-%else
-%{_bindir}/pip%{python_version}
-%endif
 %ghost %{_sysconfdir}/alternatives/pip
 %{python_sitelib}/pip-%{upversion}-py%{python_version}.egg-info
 %{python_sitelib}/pip
+%endif
 
 %changelog