Sync python dependency conversion with pyreq2rpm.
This commit is contained in:
parent
7398b71fbc
commit
fbe1c77166
@ -49,6 +49,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py
|
|||||||
%changelog
|
%changelog
|
||||||
* Tue Jul 21 2020 Miro Hrončok <mhroncok@redhat.com> - 11-10
|
* Tue Jul 21 2020 Miro Hrončok <mhroncok@redhat.com> - 11-10
|
||||||
- pythondistdeps: Split Python Extras names after the rightmost plus sign
|
- pythondistdeps: Split Python Extras names after the rightmost plus sign
|
||||||
|
- pythondistdeps: Handle edge cases of version comparisons more closely to
|
||||||
|
upstream, despite irrationality
|
||||||
|
See: https://github.com/pypa/packaging/issues/320
|
||||||
|
|
||||||
* Fri Jul 10 2020 Tomas Orsava <torsava@redhat.com> - 11-9
|
* Fri Jul 10 2020 Tomas Orsava <torsava@redhat.com> - 11-9
|
||||||
- pythondistdeps: Implement provides/requires for extras packages
|
- pythondistdeps: Implement provides/requires for extras packages
|
||||||
|
@ -115,12 +115,12 @@ def convert_ordered(name, operator, version_id):
|
|||||||
# with ordered comparisons
|
# with ordered comparisons
|
||||||
version_id = version_id[:-2]
|
version_id = version_id[:-2]
|
||||||
version = RpmVersion(version_id)
|
version = RpmVersion(version_id)
|
||||||
if '>' == operator:
|
if operator == '>':
|
||||||
# distutils does not behave this way, but this is
|
# distutils will allow a prefix match with '>'
|
||||||
# their recommendation
|
|
||||||
# https://mail.python.org/archives/list/distutils-sig@python.org/thread/NWEQVTCX5CR2RKW2LT4H77PJTEINSX7P/
|
|
||||||
operator = '>='
|
operator = '>='
|
||||||
version.increment()
|
if operator == '<=':
|
||||||
|
# distutils will not allow a prefix match with '<='
|
||||||
|
operator = '<'
|
||||||
else:
|
else:
|
||||||
version = RpmVersion(version_id)
|
version = RpmVersion(version_id)
|
||||||
return '{} {} {}'.format(name, operator, version)
|
return '{} {} {}'.format(name, operator, version)
|
||||||
|
Loading…
Reference in New Issue
Block a user