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

Define %python_platform (as a Python version agnostic option to %python3_platform)

Browse Source 
%python2_platform is also defined, for consistency.
This commit is contained in:
Miro Hrončok 2020-07-20 17:33:32 +02:00
parent 69b1b30d53
commit 0086612c98
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macros.python
View File

@ -4,6 +4,7 @@
%python_sitearch %(%{__python} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") %python_sitearch %(%{__python} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
%python_version %(%{__python} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))") %python_version %(%{__python} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
%python_version_nodots %(%{__python} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") %python_version_nodots %(%{__python} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
%python_platform %(%{__python} -Esc "import sysconfig; print(sysconfig.get_platform())")
%py_setup setup.py %py_setup setup.py
%py_shbang_opts -s %py_shbang_opts -s

1
macros.python2
View File

@ -2,6 +2,7 @@
%python2_sitearch %(%{__python2} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") %python2_sitearch %(%{__python2} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
%python2_version %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))") %python2_version %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
%python2_version_nodots %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") %python2_version_nodots %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
%python2_platform %(%{__python2} -Esc "import sysconfig; print(sysconfig.get_platform())")
%py2_shbang_opts -s %py2_shbang_opts -s
%py2_shbang_opts_nodash %(opts=%{py2_shbang_opts}; echo ${opts#-}) %py2_shbang_opts_nodash %(opts=%{py2_shbang_opts}; echo ${opts#-})

1
python-rpm-macros.spec
View File

@ -111,6 +111,7 @@ install -m 644 compileall2.py %{buildroot}%{_rpmconfigdir}/redhat/
- Make the unversioned %%__python macro error - Make the unversioned %%__python macro error
- https://fedoraproject.org/wiki/Changes/PythonMacroError - https://fedoraproject.org/wiki/Changes/PythonMacroError
- Make %%python macros more consistent with %%python3 macros - Make %%python macros more consistent with %%python3 macros
- Define %%python_platform (as a Python version agnostic option to %%python3_platform)
* Wed Jul 08 2020 Miro Hrončok <mhroncok@redhat.com> - 3.9-5 * Wed Jul 08 2020 Miro Hrončok <mhroncok@redhat.com> - 3.9-5
- Introduce %%python_extras_subpkg - Introduce %%python_extras_subpkg

1
tests/test_evals.py
View File

@ -371,6 +371,7 @@ unversioned_macros = pytest.mark.parametrize('macro', [
'%python_version_nodots', '%python_version_nodots',
'%python_sitelib', '%python_sitelib',
'%python_sitearch', '%python_sitearch',
'%python_platform',
'%py_shebang_fix', '%py_shebang_fix',
'%py_build', '%py_build',
'%py_build_egg', '%py_build_egg',