From 34466b4ae24698798850a94ae7bd9ae5ee32658076c3961fdcc1446f161c9872 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 15 May 2019 15:33:36 +0000 Subject: [PATCH] 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 --- _multibuild | 3 ++ _servicedata | 2 +- pip-19.1.1+git.1557521541.a731e7e3.tar.xz | 3 -- pip-19.1.1+git.1557777841.63878672.tar.xz | 3 ++ python-pip.changes | 21 ++++++++++++++ python-pip.spec | 34 +++++++++++------------ 6 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 _multibuild delete mode 100644 pip-19.1.1+git.1557521541.a731e7e3.tar.xz create mode 100644 pip-19.1.1+git.1557777841.63878672.tar.xz diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/_servicedata b/_servicedata index f71316e..0103d15 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/pypa/pip - a731e7e37d101673d29a6a4d901c4e5572e69b9d \ No newline at end of file + 63878672881d08f048eb2c2f757da2b834040231 \ No newline at end of file diff --git a/pip-19.1.1+git.1557521541.a731e7e3.tar.xz b/pip-19.1.1+git.1557521541.a731e7e3.tar.xz deleted file mode 100644 index 3317dda..0000000 --- a/pip-19.1.1+git.1557521541.a731e7e3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c5e60fcf40ee43fcd35f504cdf757243df6cfe585d431e9dc6dc7ddc5ba2353 -size 5629936 diff --git a/pip-19.1.1+git.1557777841.63878672.tar.xz b/pip-19.1.1+git.1557777841.63878672.tar.xz new file mode 100644 index 0000000..e5e8408 --- /dev/null +++ b/pip-19.1.1+git.1557777841.63878672.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:752fd3ac1f1925cb3c4191673194e124c07d3271c84401cacab6213f6a608353 +size 5630236 diff --git a/python-pip.changes b/python-pip.changes index 028eecf..5d51ca9 100644 --- a/python-pip.changes +++ b/python-pip.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed May 15 14:15:56 UTC 2019 - Matej Cepl + +- 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. + +------------------------------------------------------------------- +Wed May 15 15:35:34 CEST 2019 - Matej Cepl + +- Switch to multibuild, so testing is separate from the building + of the package itself. + ------------------------------------------------------------------- Sat May 11 13:41:41 UTC 2019 - Matej Cepl diff --git a/python-pip.spec b/python-pip.spec index 7f76927..fae0a3d 100644 --- a/python-pip.spec +++ b/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