%pyproject_buildrequires: Accept installed pre-releases for all requirements
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2014639
This commit is contained in:
parent
cefe82ed0d
commit
27e23c1e87
@ -6,7 +6,7 @@ License: MIT
|
||||
|
||||
# Keep the version at zero and increment only release
|
||||
Version: 0
|
||||
Release: 47%{?dist}
|
||||
Release: 48%{?dist}
|
||||
|
||||
# Macro files
|
||||
Source001: macros.pyproject
|
||||
@ -113,6 +113,10 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Sat Oct 16 2021 Miro Hrončok <mhroncok@redhat.com> - 0-48
|
||||
- %%pyproject_buildrequires: Accept installed pre-releases for all requirements
|
||||
- Fixes: rhbz#2014639
|
||||
|
||||
* Thu Sep 09 2021 Miro Hrončok <mhroncok@redhat.com> - 0-47
|
||||
- %%pyproject_save_files: Expand the namespace error message, also display it with /
|
||||
- %%pyproject_save_files: Add a workaround error for spaces and [brackets]
|
||||
|
@ -127,6 +127,11 @@ class Requirements:
|
||||
print_err(f'Ignoring alien requirement:', requirement_str)
|
||||
return
|
||||
|
||||
# We need to always accept pre-releases as satisfying the requirement
|
||||
# Otherwise e.g. installed cffi version 1.15.0rc2 won't even satisfy the requirement for "cffi"
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2014639#c3
|
||||
requirement.specifier.prereleases = True
|
||||
|
||||
try:
|
||||
# TODO: check if requirements with extras are satisfied
|
||||
installed = self.get_installed_version(requirement.name)
|
||||
|
@ -717,3 +717,26 @@ Weird and complex requirements file:
|
||||
# but that's good enough:
|
||||
- "WARNING: Simplifying 'ugly@git+https://github.com/monty/spam.git@master#egg=ugly' to 'ugly'."
|
||||
result: 0
|
||||
|
||||
|
||||
Pre-releases are accepted:
|
||||
installed:
|
||||
setuptools: 50
|
||||
wheel: 1
|
||||
toml: 1
|
||||
cffi: 1.15.0rc2
|
||||
pyproject.toml: |
|
||||
[build-system]
|
||||
requires = [
|
||||
"setuptools",
|
||||
"wheel",
|
||||
"cffi",
|
||||
]
|
||||
build-backend = "setuptools.build_meta"
|
||||
expected: |
|
||||
python3dist(setuptools)
|
||||
python3dist(wheel)
|
||||
python3dist(cffi)
|
||||
python3dist(wheel)
|
||||
stderr_contains: "Requirement satisfied: cffi"
|
||||
result: 0
|
||||
|
Loading…
Reference in New Issue
Block a user