From cce56588a5a64ef2050fa69ffe30a39ca4f7d48f Mon Sep 17 00:00:00 2001 From: desert-sailor Date: Mon, 24 Jul 2023 11:42:29 +0800 Subject: [PATCH] add pytest and tox macros --- add-pytest-and-tox-macros.patch | 42 +++++++++++++++++++++++++++++++++ openEuler-rpm-config.spec | 6 ++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 add-pytest-and-tox-macros.patch diff --git a/add-pytest-and-tox-macros.patch b/add-pytest-and-tox-macros.patch new file mode 100644 index 0000000..b76444e --- /dev/null +++ b/add-pytest-and-tox-macros.patch @@ -0,0 +1,42 @@ +From 2f7b74e83fc52d326d5db7de2bcfab2c8d921f29 Mon Sep 17 00:00:00 2001 +From: desert-sailor +Date: Mon, 24 Jul 2023 11:36:52 +0800 +Subject: [PATCH] add pytest and tox macros + +--- + macros.python | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/macros.python b/macros.python +index 1cc6e70..334c0ab 100644 +--- a/macros.python ++++ b/macros.python +@@ -304,3 +304,25 @@ find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $pyth + %python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())") + %python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") + %python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])") ++ ++# New python test macros ++%pytest() %{expand:\\\ ++CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" \\ ++PATH="%{buildroot}%{_bindir}:$PATH" \\ ++PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}" \\ ++PYTHONDONTWRITEBYTECODE=1 \\ ++%{?__pytest_addopts:PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} %{__pytest_addopts}"} \\ ++PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus} \\ ++%{_bindir}/pytest %{?*} ++} ++ ++%tox() %{expand:\\\ ++TOX_TESTENV_PASSENV="${TOX_TESTENV_PASSENV:-*}" \\ ++CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" \\ ++PATH="%{buildroot}%{_bindir}:$PATH" \\ ++PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}" \\ ++PYTHONDONTWRITEBYTECODE=1 \\ ++%{?__pytest_addopts:PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} %{__pytest_addopts}"} \\ ++PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus} \\ ++%{__python3} -m tox -e py%{python3_version_nodots} --current-env %{?*} ++} +-- +2.33.0 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index fb07902..77a2a50 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 39 +Release: 40 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -30,6 +30,7 @@ Patch16: fix-config-error-for-loongarch64.patch Patch17: Feature-support-EBS-sign-for-IMA-digest-list.patch Patch18: fix-brp-ldconfig-riscv-default-library-directory.patch Patch19: add-pyproject-macros.patch +Patch20: add-pytest-and-tox-macros.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -141,6 +142,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Mon Jul 24 2023 Dongxing Wang - 30-40 +- add pytest and tox macros + * Thu May 11 2023 caodongxia - 30-39 - improve pyproject_install macro