rpms/pyproject-rpm-macros
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix typo in function name 'evaluate_all_environamnets'

Browse Source 
The function is only used internally in these macros,
so name change should not break any users.

Related: rhbz#2168193
This commit is contained in:
Otto Liljalaakso 2022-08-30 23:22:59 +03:00 committed by Miro Hrončok
parent 8c8a3ad80b
commit e8135abc2f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyproject-rpm-macros.spec
View File

@ -12,7 +12,7 @@ License: MIT
# Increment Y and reset Z when new macros or features are added # Increment Y and reset Z when new macros or features are added
# Increment Z when this is a bugfix or a cosmetic change # Increment Z when this is a bugfix or a cosmetic change
# Dropping support for EOL Fedoras is *not* considered a breaking change # Dropping support for EOL Fedoras is *not* considered a breaking change
Version: 1.3.3 Version: 1.3.4
Release: 1%{?dist} Release: 1%{?dist}
# Macro files # Macro files
@ -129,6 +129,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856
%license LICENSE %license LICENSE
%changelog %changelog
* Tue Aug 30 2022 Otto Liljalaakso <otto.liljalaakso@iki.fi> - 1.3.4-1
- Fix typo in internal function name
* Tue Aug 09 2022 Karolina Surma <ksurma@redhat.com> - 1.3.3-1 * Tue Aug 09 2022 Karolina Surma <ksurma@redhat.com> - 1.3.3-1
- Don't fail %%pyproject_save_files '*' if no modules are detected - Don't fail %%pyproject_save_files '*' if no modules are detected

4
pyproject_buildrequires.py
View File

@ -100,7 +100,7 @@ class Requirements:
return [{'extra': e} for e in sorted(self.extras)] return [{'extra': e} for e in sorted(self.extras)]
return [{'extra': ''}] return [{'extra': ''}]
def evaluate_all_environamnets(self, requirement): def evaluate_all_environments(self, requirement):
for marker_env in self.marker_envs: for marker_env in self.marker_envs:
if requirement.marker.evaluate(environment=marker_env): if requirement.marker.evaluate(environment=marker_env):
return True return True
@ -126,7 +126,7 @@ class Requirements:
name = canonicalize_name(requirement.name) name = canonicalize_name(requirement.name)
if (requirement.marker is not None and if (requirement.marker is not None and
not self.evaluate_all_environamnets(requirement)): not self.evaluate_all_environments(requirement)):
print_err(f'Ignoring alien requirement:', requirement_str) print_err(f'Ignoring alien requirement:', requirement_str)
return return