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

Remove stray __pycache__ directory from /usr/bin when running %py_install, %py_install_wheel and %py_install_egg macros

Browse Source 
Solves bz#1739848
This commit is contained in:
Anna Khaitovich 2019-12-28 19:16:16 +01:00 committed by Miro Hrončok
parent 6c63a5b7f4
commit 2314fd928a
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros.python
View File

@ -31,15 +31,18 @@
%py_install() %{expand:\\\ %py_install() %{expand:\\\
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\ CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
%{__python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} %{__python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
%py_install_egg() %{expand:\\\ %py_install_egg() %{expand:\\\
mkdir -p %{buildroot}%{python_sitelib} mkdir -p %{buildroot}%{python_sitelib}
easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python_version}.egg %{?*} easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python_version}.egg %{?*}
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
%py_install_wheel() %{expand:\\\ %py_install_wheel() %{expand:\\\
pip install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps pip install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
%python_provide() %{lua: %python_provide() %{lua:

3
macros.python2
View File

@ -33,13 +33,16 @@
%py2_install() %{expand:\\\ %py2_install() %{expand:\\\
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\ CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
%{__python2} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} %{__python2} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
%py2_install_egg() %{expand:\\\ %py2_install_egg() %{expand:\\\
mkdir -p %{buildroot}%{python2_sitelib} mkdir -p %{buildroot}%{python2_sitelib}
easy_install-%{python2_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python2_version}.egg %{?*} easy_install-%{python2_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python2_version}.egg %{?*}
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
%py2_install_wheel() %{expand:\\\ %py2_install_wheel() %{expand:\\\
pip%{python2_version} install -I dist/%{1} --root %{buildroot} --no-deps pip%{python2_version} install -I dist/%{1} --root %{buildroot} --no-deps
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }

3
macros.python3
View File

@ -27,15 +27,18 @@
%py3_install() %{expand:\\\ %py3_install() %{expand:\\\
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\ CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
%{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
%py3_install_egg() %{expand:\\\ %py3_install_egg() %{expand:\\\
mkdir -p %{buildroot}%{python3_sitelib} mkdir -p %{buildroot}%{python3_sitelib}
easy_install-%{python3_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*} easy_install-%{python3_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*}
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
%py3_install_wheel() %{expand:\\\ %py3_install_wheel() %{expand:\\\
pip%{python3_version} install -I dist/%{1} --root %{buildroot} --no-deps pip%{python3_version} install -I dist/%{1} --root %{buildroot} --no-deps
rm -rfv %{buildroot}%{_bindir}/__pycache__
} }
# This only supports Python 3.5+ and will never work with Python 2. # This only supports Python 3.5+ and will never work with Python 2.

2
python-rpm-macros.spec
View File

@ -81,6 +81,8 @@ install -m 644 %{SOURCE5} \
* Sat Dec 28 2019 Miro Hrončok <mhroncok@redhat.com> - 3-51 * Sat Dec 28 2019 Miro Hrončok <mhroncok@redhat.com> - 3-51
- Define %%python, but make it work only if %%__python is redefined - Define %%python, but make it work only if %%__python is redefined
- Add the %%pycached macro - Add the %%pycached macro
- Remove stray __pycache__ directory from /usr/bin when running %%py_install,
%%py_install_wheel and %%py_build_wheel macros
* Tue Nov 26 2019 Lumír Balhar <lbalhar@redhat.com> - 3-50 * Tue Nov 26 2019 Lumír Balhar <lbalhar@redhat.com> - 3-50
- Update of bundled compileall2 module - Update of bundled compileall2 module