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/_service b/_service new file mode 100644 index 0000000..24beb33 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + 19.1.1+git + https://github.com/pypa/pip + git + .git* + enable + Matej Cepl <mcepl@cepl.eu> + + + xz + *.tar + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..0103d15 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/pypa/pip + 63878672881d08f048eb2c2f757da2b834040231 \ No newline at end of file diff --git a/pip-19.0.3.tar.gz b/pip-19.0.3.tar.gz deleted file mode 100644 index 979b710..0000000 --- a/pip-19.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2 -size 1324617 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/pip-shipped-requests-cabundle.patch b/pip-shipped-requests-cabundle.patch index e2cb600..456b0b5 100644 --- a/pip-shipped-requests-cabundle.patch +++ b/pip-shipped-requests-cabundle.patch @@ -1,19 +1,10 @@ -Index: b/src/pip/_vendor/certifi/core.py -=================================================================== --- a/src/pip/_vendor/certifi/core.py +++ b/src/pip/_vendor/certifi/core.py -@@ -7,13 +7,11 @@ certifi.py - - This module returns the installation location of cacert.pem. - """ --import os +@@ -10,6 +10,4 @@ import os def where(): - f = os.path.dirname(__file__) - +- - return os.path.join(f, 'cacert.pem') + return '/etc/ssl/ca-bundle.pem' - - - if __name__ == '__main__': diff --git a/python-pip.changes b/python-pip.changes index 179bb7d..5d51ca9 100644 --- a/python-pip.changes +++ b/python-pip.changes @@ -1,3 +1,110 @@ +------------------------------------------------------------------- +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 + +- Update to version 19.1.1+git.1557521541.a731e7e3: + * Docs: capitalize "URL" + * Upgrade Sphinx version for Read the Docs (#6477) + * Upwrap import + * Remove utils/packaging.py's dependence on the current environment. + * Improve import error handling Fix --no-index usage Fix missing type annotation type + * Rename _link_package_versions() to evaluate_link(). + * Move _link_package_versions() to CandidateEvaluator. + * Refine return type of _package_versions() and find_all_candidates(). + * Fix mismerged import + * Issue #5948: Enable keyring support + * Move run_with_log_command() after run_stderr_with_prefix(). + * Change to never allow logging errors during tests. + * Add failing test. + * Respect --global-option and --install-option for VCS installs. +- Start using upstream git checkout instead of the released + tarballs so we can get tests/ directory (gh#pypa/pip#6258). +- Enable tests. + +------------------------------------------------------------------- +Fri May 10 23:17:02 CEST 2019 - Matej Cepl + +- Update to 19.1.1: + - Restore pyproject.toml handling to how it was with pip 19.0.3 + to prevent the need to add --no-use-pep517 when installing in + editable mode. (#6434) + - Fix a regression that caused @ to be quoted in pypiserver + links. This interfered with parsing the revision string from + VCS urls. (#6440) + - Configuration files may now also be stored under sys.prefix + (#5060) + - Avoid creating an unnecessary local clone of a Bazaar branch + when exporting. (#5443) + - Include in pip's User-Agent string whether it looks like pip + is running under CI. (#5499) + - A custom (JSON-encoded) string can now be added to pip's + User-Agent using the PIP_USER_AGENT_USER_DATA environment + variable. (#5549) + - For consistency, passing --no-cache-dir no longer affects + whether wheels will be built. In this case, a temporary + directory is used. (#5749) + - Command arguments in subprocess log messages are now quoted + using shlex.quote(). (#6290) + - Prefix warning and error messages in log output with WARNING + and ERROR. (#6298) + - Using --build-options in a PEP 517 build now fails with an + error, rather than silently ignoring the option. (#6305) + - Error out with an informative message if one tries to install + a pyproject.toml-style (PEP 517) source tree using --editable + mode. (#6314) + - When downloading a package, the ETA and average speed now + only update once per second for better legibility. (#6319) + - The stdout and stderr from VCS commands run by pip as + subprocesses (e.g. git, hg, etc.) no longer pollute pip's + stdout. (#1219) + - Fix handling of requests exceptions when dependencies are + debundled. (#4195) + - Make pip's self version check avoid recommending upgrades to + prereleases if the currently-installed version is stable. + (#5175) + - Fixed crash when installing a requirement from a URL that + comes from a dependency without a URL. (#5889) + - Improve handling of file URIs: correctly handle + file://localhost/... and don't try to use UNC paths on Unix. + (#5892) + - Fix utils.encoding.auto_decode() LookupError with invalid + encodings. utils.encoding.auto_decode() was broken when + decoding Big Endian BOM byte-strings on Little Endian or vice + versa. (#6054) + - Fix incorrect URL quoting of IPv6 addresses. (#6285) + - Redact the password from the extra index URL when using pip + -v. (#6295) + - The spinner no longer displays a completion message after + subprocess calls not needing a spinner. It also no longer + incorrectly reports an error after certain subprocess calls + to Git that succeeded. (#6312) + - Fix the handling of editable mode during installs when + pyproject.toml is present but PEP 517 doesn't require the + source tree to be treated as pyproject.toml-style. (#6370) + - Fix NameError when handling an invalid requirement. (#6419) + - Make dashes render correctly when displaying long options + like --find-links in the text. (#6422) + ------------------------------------------------------------------- Sun Mar 10 16:35:47 UTC 2019 - Arun Persaud diff --git a/python-pip.spec b/python-pip.spec index 5f86630..fae0a3d 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -17,17 +17,22 @@ %{?!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 +%else +%define psuffix %{nil} %bcond_with test -Name: python-pip -Version: 19.0.3 +%endif +Name: python-pip%{psuffix} +Version: 19.1.1+git.1557777841.63878672 Release: 0 Summary: A Python package management system License: MIT Group: Development/Languages/Python URL: http://www.pip-installer.org -Source: https://files.pythonhosted.org/packages/source/p/pip/pip-%{version}.tar.gz +Source: pip-%{version}.tar.xz Patch0: pip-shipped-requests-cabundle.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -42,6 +47,7 @@ Recommends: ca-certificates-mozilla BuildArch: noarch %if %{with test} # Test requirements: +BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module docutils} BuildRequires: %{python_module freezegun} BuildRequires: %{python_module mock} @@ -49,9 +55,14 @@ BuildRequires: %{python_module pretend} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scripttest >= 1.3} BuildRequires: %{python_module virtualenv >= 1.10} +BuildRequires: ca-certificates +BuildRequires: git +BuildRequires: subversion %endif %python_subpackages +%define upversion %(echo %{version} |cut -d+ -f 1) + %description Pip is a replacement for easy_install. It uses mostly the same techniques for finding packages, so packages that were made easy_installable should be @@ -70,13 +81,16 @@ 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 -%python_expand py.test-%{$python_version} +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 %pre @@ -87,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-%{version}-py%{python_version}.egg-info +%{python_sitelib}/pip-%{upversion}-py%{python_version}.egg-info %{python_sitelib}/pip +%endif %changelog