rpms/python-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use compileall from stdlib for Python >= 3.9

Browse Source
This commit is contained in:
Lumir Balhar 2020-06-05 08:52:58 +02:00 committed by Miro Hrončok
parent 985a80572f
commit 3a211cc91b
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
macros.pybytecompile
View File

@ -28,9 +28,22 @@ py3_byte_compile () {\
PYTHONPATH="%{_rpmconfigdir}/redhat" $python_binary -s -B -m compileall2 -o 0 -o 1 -s $RPM_BUILD_ROOT -p / $bytecode_compilation_path \ PYTHONPATH="%{_rpmconfigdir}/redhat" $python_binary -s -B -m compileall2 -o 0 -o 1 -s $RPM_BUILD_ROOT -p / $bytecode_compilation_path \
}\ }\
\ \
py39_byte_compile () {\
python_binary="%1"\
bytecode_compilation_path="%2"\
$python_binary -s -B -m compileall -o 0 -o 1 -s $RPM_BUILD_ROOT -p / $bytecode_compilation_path \
}\
\
# Path to intepreter should not contain any arguments \ # Path to intepreter should not contain any arguments \
[[ "%1" =~ " -" ]] && echo "ERROR py_byte_compile: Path to interpreter should not contain any arguments" >&2 && exit 1 \ [[ "%1" =~ " -" ]] && echo "ERROR py_byte_compile: Path to interpreter should not contain any arguments" >&2 && exit 1 \
# Get version without a dot (36 instead of 3.6), bash doesn't compare floats well \ # Get version without a dot (36 instead of 3.6), bash doesn't compare floats well \
python_version=$(%1 -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") \ python_version=$(%1 -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") \
# compileall2 Python module is not compatible with Python < 3.4 \ # compileall2 is an enhanced fork of stdlib compileall module for Python >= 3.4 \
if [ "$python_version" -ge 34 ]; then py3_byte_compile "%1" "%2"; else py2_byte_compile "%1" "%2"; fi # and it was merged back to stdlib in Python >= 3.9 \
if [ "$python_version" -ge 39 ]; then \
py39_byte_compile "%1" "%2"; \
elif [ "$python_version" -ge 34 ]; then \
py3_byte_compile "%1" "%2"; \
else \
py2_byte_compile "%1" "%2"; \
fi

5
python-rpm-macros.spec
View File

@ -1,6 +1,6 @@
Name: python-rpm-macros Name: python-rpm-macros
Version: 3.9 Version: 3.9
Release: 3%{?dist} Release: 4%{?dist}
Summary: The common Python RPM macros Summary: The common Python RPM macros
# macros and lua: MIT, compileall2.py: PSFv2 # macros and lua: MIT, compileall2.py: PSFv2
@ -107,6 +107,9 @@ install -m 644 compileall2.py %{buildroot}%{_rpmconfigdir}/redhat/
%changelog %changelog
* Tue Jun 16 2020 Lumír Balhar <lbalhar@redhat.com> - 3.9-4
- Use compileall from stdlib for Python >= 3.9
* Thu Jun 11 2020 Miro Hrončok <mhroncok@redhat.com> - 3.9-3 * Thu Jun 11 2020 Miro Hrončok <mhroncok@redhat.com> - 3.9-3
- Allow to combine %%pycached with other macros (e.g. %%exclude or %%ghost) (#1838992) - Allow to combine %%pycached with other macros (e.g. %%exclude or %%ghost) (#1838992)