Hello community,
here is the log from the commit of package python-pip-shims for
openSUSE:Factory checked in at 2020-10-18 16:29:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pip-shims (Old)
and /work/SRC/openSUSE:Factory/.python-pip-shims.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pip-shims"
Sun Oct 18 16:29:03 2020 rev:6 rq:841970 version:0.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pip-shims/python-pip-shims.changes
2020-07-15 12:12:12.112606190 +0200
+++
/work/SRC/openSUSE:Factory/.python-pip-shims.new.3486/python-pip-shims.changes
2020-10-18 16:30:47.384741009 +0200
@@ -1,0 +2,8 @@
+Thu Oct 15 12:08:37 UTC 2020 - Benjamin Greiner <[email protected]>
+
+- Update to v0.5.3
+ * Avoid overriding slot members when adding new methods to a
+ class. #67
+ * Call ``resolve()`` with correct arguments for pip 20.2. #68
+
+-------------------------------------------------------------------
Old:
----
pip-shims-0.5.2.tar.gz
New:
----
pip-shims-0.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pip-shims.spec ++++++
--- /var/tmp/diff_new_pack.Ghuuug/_old 2020-10-18 16:30:51.328742764 +0200
+++ /var/tmp/diff_new_pack.Ghuuug/_new 2020-10-18 16:30:51.328742764 +0200
@@ -19,13 +19,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without python2
Name: python-pip-shims
-Version: 0.5.2
+Version: 0.5.3
Release: 0
Summary: Compatibility shims for pip versions 8 thru current
License: ISC
URL: https://github.com/sarugaku/pip-shims
Source:
https://github.com/sarugaku/pip-shims/archive/%{version}.tar.gz#/pip-shims-%{version}.tar.gz
-BuildRequires: %{python_module setuptools >= 36.2.2}
+BuildRequires: %{python_module setuptools >= 40.8.0}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
%if %{with python2}
@@ -70,6 +70,7 @@
%files %{python_files}
%license LICENSE
%doc README.rst CHANGELOG.rst docs/*.rst
-%{python_sitelib}/*
+%{python_sitelib}/pip_shims
+%{python_sitelib}/pip_shims-%{version}*info
%changelog
++++++ pip-shims-0.5.2.tar.gz -> pip-shims-0.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pip-shims-0.5.2/CHANGELOG.rst
new/pip-shims-0.5.3/CHANGELOG.rst
--- old/pip-shims-0.5.2/CHANGELOG.rst 2020-04-22 23:21:42.000000000 +0200
+++ new/pip-shims-0.5.3/CHANGELOG.rst 2020-08-08 01:10:52.000000000 +0200
@@ -1,3 +1,14 @@
+0.5.3 (2020-08-08)
+==================
+
+Bug Fixes
+---------
+
+- Avoid overriding slot members when adding new methods to a class. `#67
<https://github.com/sarugaku/pip-shims/issues/67>`_
+
+- Call ``resolve()`` with correct arguments for pip 20.2. `#68
<https://github.com/sarugaku/pip-shims/issues/68>`_
+
+
0.5.2 (2020-04-22)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pip-shims-0.5.2/azure-pipelines.yml
new/pip-shims-0.5.3/azure-pipelines.yml
--- old/pip-shims-0.5.2/azure-pipelines.yml 2020-04-22 23:21:42.000000000
+0200
+++ new/pip-shims-0.5.3/azure-pipelines.yml 2020-08-08 01:10:52.000000000
+0200
@@ -30,21 +30,21 @@
vmImage: 'Ubuntu-latest'
jobName: TestLinux
pythonVersions: ["3.8", "3.7", "3.6", "3.5", "2.7"]
- pipVersions: ["pip==9.0.3", "pip==10.0.1", "pip==18.0", "pip==19.0.3",
"pip==19.1.1", "pip==19.2.3", "pip==19.3.1", "20.0.1",
"git+https://github.com/pypa/pip@master#egg=pip";]
+ pipVersions: ["pip==9.0.3", "pip==10.0.1", "pip==18.0", "pip==19.0.3",
"pip==19.1.1", "pip==19.2.3", "pip==19.3.1", "pip==20.0.1",
"git+https://github.com/pypa/pip@master#egg=pip";]
- template: .azure-pipelines/templates/run-tests.yml
parameters:
vmImage: 'windows-latest'
jobName: TestWindows
pythonVersions: ["3.8", "3.7", "3.6", "3.5", "2.7"]
- pipVersions: ["pip==9.0.3", "pip==10.0.1", "pip==18.0", "pip==19.0.3",
"pip==19.1.1", "pip==19.2.3", "pip==19.3.1", "20.0.1",
"git+https://github.com/pypa/pip@master#egg=pip";]
+ pipVersions: ["pip==9.0.3", "pip==10.0.1", "pip==18.0", "pip==19.0.3",
"pip==19.1.1", "pip==19.2.3", "pip==19.3.1", "pip==20.0.1",
"git+https://github.com/pypa/pip@master#egg=pip";]
- template: .azure-pipelines/templates/run-tests.yml
parameters:
vmImage: 'macOS-latest'
jobName: TestMacOS
pythonVersions: ["3.8", "3.7", "3.6", "3.5", "2.7"]
- pipVersions: ["pip==9.0.3", "pip==10.0.1", "pip==18.0", "pip==19.0.3",
"pip==19.1.1", "pip==19.2.3", "pip==19.3.1", "20.0.1",
"git+https://github.com/pypa/pip@master#egg=pip";]
+ pipVersions: ["pip==9.0.3", "pip==10.0.1", "pip==18.0", "pip==19.0.3",
"pip==19.1.1", "pip==19.2.3", "pip==19.3.1", "pip==20.0.1",
"git+https://github.com/pypa/pip@master#egg=pip";]
- job: BuildPackage
dependsOn:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pip-shims-0.5.2/src/pip_shims/__init__.py
new/pip-shims-0.5.3/src/pip_shims/__init__.py
--- old/pip-shims-0.5.2/src/pip_shims/__init__.py 2020-04-22
23:21:42.000000000 +0200
+++ new/pip-shims-0.5.3/src/pip_shims/__init__.py 2020-08-08
01:10:52.000000000 +0200
@@ -25,7 +25,7 @@
from . import shims
-__version__ = "0.5.2"
+__version__ = "0.5.3"
if "pip_shims" in sys.modules:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pip-shims-0.5.2/src/pip_shims/compat.py
new/pip-shims-0.5.3/src/pip_shims/compat.py
--- old/pip-shims-0.5.2/src/pip_shims/compat.py 2020-04-22 23:21:42.000000000
+0200
+++ new/pip-shims-0.5.3/src/pip_shims/compat.py 2020-08-08 01:10:52.000000000
+0200
@@ -904,13 +904,9 @@
if options is not None and pip_options_created:
for k, v in options_map.items():
suppress_setattr(options, k, v, filter_none=True)
- if all([session is None, install_cmd is None, session_is_required]):
- raise TypeError(
- "Preparer requires a session instance which was not supplied and
cannot be "
- "created without an InstallCommand."
- )
- elif all([session is None, session_is_required]):
- session = get_session(install_cmd=install_cmd, options=options)
+ if session_is_required:
+ if session is None:
+ session = get_session(install_cmd=install_cmd, options=options)
preparer_args["session"] = session
if finder_is_required:
finder = _ensure_finder(
@@ -928,7 +924,7 @@
if "req_tracker" in required_args:
req_tracker = tracker_ctx if req_tracker is None else req_tracker
preparer_args["req_tracker"] = req_tracker
-
+ preparer_args["lazy_wheel"] = True
result = call_function_with_correct_args(preparer_fn, **preparer_args)
yield result
@@ -1318,7 +1314,11 @@
wheel_cache_provider(kwargs["cache_dir"], format_control)
) # type: ignore
ireq.is_direct = True # type: ignore
- build_location_kwargs = {"build_dir": kwargs["build_dir"],
"autodelete": True}
+ build_location_kwargs = {
+ "build_dir": kwargs["build_dir"],
+ "autodelete": True,
+ "parallel_builds": False
+ }
call_function_with_correct_args(ireq.build_location,
**build_location_kwargs)
if reqset_provider is None:
raise TypeError(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pip-shims-0.5.2/src/pip_shims/models.py
new/pip-shims-0.5.3/src/pip_shims/models.py
--- old/pip-shims-0.5.2/src/pip_shims/models.py 2020-04-22 23:21:42.000000000
+0200
+++ new/pip-shims-0.5.3/src/pip_shims/models.py 2020-08-08 01:10:52.000000000
+0200
@@ -441,27 +441,20 @@
)
if not methods and not classmethods:
return provided
- new_functions = provided.__dict__.copy()
- if classmethods:
- new_functions.update(
- {
- method_name: clsmethod
- for method_name, clsmethod in classmethods.items()
- if method_name not in provided.__dict__
- }
- )
- if methods:
- new_functions.update(
- {
- method_name: method
- for method_name, method in methods.items()
- if method_name not in provided.__dict__
- }
- )
classname = provided.__name__
if six.PY2:
classname = classname.encode(sys.getdefaultencoding())
- type_ = type(classname, (provided,), new_functions)
+ type_ = type(classname, (provided,), {})
+
+ if classmethods:
+ for method_name, clsmethod in classmethods.items():
+ if method_name not in provided.__dict__:
+ type.__setattr__(type_, method_name, clsmethod)
+
+ if methods:
+ for method_name, clsmethod in methods.items():
+ if method_name not in provided.__dict__:
+ type.__setattr__(type_, method_name, clsmethod)
return type_
@property
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pip-shims-0.5.2/tests/test_instances.py
new/pip-shims-0.5.3/tests/test_instances.py
--- old/pip-shims-0.5.2/tests/test_instances.py 2020-04-22 23:21:42.000000000
+0200
+++ new/pip-shims-0.5.3/tests/test_instances.py 2020-08-08 01:10:52.000000000
+0200
@@ -377,6 +377,9 @@
preparer_kwargs["req_tracker"] = req_tracker
if parse_version(pip_version) >= parse_version("19.3.9"):
preparer_kwargs.pop("session", None)
+ if parse_version(pip_version) >= parse_version("20.3"):
+ preparer_kwargs["session"] = session
+ preparer_kwargs["lazy_wheel"] = True
preparer = RequirementPreparer(**preparer_kwargs)
resolver_kwargs["preparer"] = preparer
reqset = RequirementSet()
@@ -567,6 +570,9 @@
kwargs.update(
{"use_user_site": False, "require_hashes": False,}
)
+ if parse_version(pip_version) >= parse_version("20.3"):
+ kwargs["session"] = session
+ kwargs["lazy_wheel"] = True
wheelcache = kwargs.pop("wheel_cache")
with get_requirement_tracker() as req_tracker:
if req_tracker:
