Re: [ptxdist] [PATCH 10/10] python3-pytest: new package

[Philipp Zabel <p.zabel@pengutronix.de>]

On Fri, 2020-07-03 at 11:22 +0200, Michael Olbrich wrote:
> On Thu, Jul 02, 2020 at 03:05:18PM +0200, Philipp Zabel wrote:
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  rules/python3-pytest.in   | 15 +++++++++
> >  rules/python3-pytest.make | 68 +++++++++++++++++++++++++++++++++++++++
> >  2 files changed, 83 insertions(+)
> >  create mode 100644 rules/python3-pytest.in
> >  create mode 100644 rules/python3-pytest.make
> > 
> > diff --git a/rules/python3-pytest.in b/rules/python3-pytest.in
> > new file mode 100644
> > index 000000000000..e92a6eeba7de
> > --- /dev/null
> > +++ b/rules/python3-pytest.in
> > @@ -0,0 +1,15 @@
> > +## SECTION=python3
> > +
> > +config PYTHON3_PYTEST
> > +	tristate
> > +	select PYTHON3
> > +	select PYTHON3_ATTRS			if RUNTIME
> > +	select PYTHON3_MORE_ITERTOOLS		if RUNTIME
> > +	select PYTHON3_PACKAGING		if RUNTIME
> > +	select PYTHON3_PLUGGY			if RUNTIME
> > +	select PYTHON3_PY			if RUNTIME
> > +	select PYTHON3_SETUPTOOLS		if RUNTIME # for pkg_resources
> > +	select PYTHON3_WCWIDTH			if RUNTIME
> > +	prompt "pytest"
> > +	help
> > +	  pytest: simple powerful testing with Python
> > diff --git a/rules/python3-pytest.make b/rules/python3-pytest.make
> > new file mode 100644
> > index 000000000000..f37a45933eda
> > --- /dev/null
> > +++ b/rules/python3-pytest.make
> > @@ -0,0 +1,68 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_PYTHON3_PYTEST) += python3-pytest
> > +
> > +#
> > +# Paths and names
> > +#
> > +PYTHON3_PYTEST_VERSION	:= 5.4.3
> > +PYTHON3_PYTEST_MD5	:= 4b6b06b2818516c7c400d4cafe3b9257
> > +PYTHON3_PYTEST		:= pytest-$(PYTHON3_PYTEST_VERSION)
> > +PYTHON3_PYTEST_SUFFIX	:= tar.gz
> > +PYTHON3_PYTEST_URL	:= https://pypi.python.org/packages/8f/c4/e4a645f8a3d6c6993cb3934ee593e705947dfafad4ca5148b9a0fde7359c/$(PYTHON3_PYTEST).$(PYTHON3_PYTEST_SUFFIX)
> > +
> > +PYTHON3_PYTEST_SOURCE	:= $(SRCDIR)/$(PYTHON3_PYTEST).$(PYTHON3_PYTEST_SUFFIX)
> > +PYTHON3_PYTEST_DIR	:= $(BUILDDIR)/$(PYTHON3_PYTEST)
> > +PYTHON3_PYTEST_LICENSE	:= MIT
> > +PYTHON3_PYTEST_LICENSE_FILES := \
> > +	file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b
> > +
> > +# ----------------------------------------------------------------------------
> > +# Prepare
> > +# ----------------------------------------------------------------------------
> > +
> > +PYTHON3_PYTEST_CONF_TOOL	:= python3
> > +
> > +# ----------------------------------------------------------------------------
> > +# Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/python3-pytest.install:
> > +	@$(call targetinfo)
> > +	@$(call world/install, PYTHON3_PYTEST)
> > +	@sed -i 's;#!/.*;#!/usr/bin/python$(PYTHON3_MAJORMINOR);' \
> > +		$(PYTHON3_PYTEST_PKGDIR)/usr/bin/*
> 
> This probably replaces the py.test with a copy of pytest.

The two files different files even without this:

packages/pytest-5.4.3/usr/bin/py.test:

----------8<----------
#!/path/to/sysroot-host/bin/python3.7
# EASY-INSTALL-ENTRY-SCRIPT: 'pytest==5.4.3','console_scripts','py.test'
__requires__ = 'pytest==5.4.3'
import re
import sys
from pkg_resources import load_entry_point

if __name__ == '__main__':
    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
    sys.exit(
        load_entry_point('pytest==5.4.3', 'console_scripts', 'py.test')()
    )
---------->8----------

packages/pytest-5.4.3/usr/bin/pytest:

----------8<----------
#!/path/to/sysroot-host/bin/python3.7
# EASY-INSTALL-ENTRY-SCRIPT: 'pytest==5.4.3','console_scripts','pytest'
__requires__ = 'pytest==5.4.3'
import re
import sys
from pkg_resources import load_entry_point

if __name__ == '__main__':
    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
    sys.exit(
        load_entry_point('pytest==5.4.3', 'console_scripts', 'pytest')()
    )
---------->8----------

> > +	@$(call touch)
> > +
> > +# ----------------------------------------------------------------------------
> > +# Target-Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/python3-pytest.targetinstall:
> > +	@$(call targetinfo)
> > +
> > +	@$(call install_init, python3-pytest)
> > +	@$(call install_fixup, python3-pytest, PRIORITY, optional)
> > +	@$(call install_fixup, python3-pytest, SECTION, base)
> > +	@$(call install_fixup, python3-pytest, AUTHOR, "Philipp Zabel <p.zabel@pengutronix.de>")
> > +	@$(call install_fixup, python3-pytest, DESCRIPTION, missing)
> > +
> > +	@$(call install_glob, python3-pytest, 0, 0, -, \
> > +		/usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/,, *.py)
> > +	@$(call install_copy, python3-pytest, 0, 0, 0755, -, /usr/bin/pytest)
> > +	@$(call install_copy, python3-pytest, 0, 0, 0755, -, /usr/bin/py.test)
> 
> At least on Debian, this is a symlink to pytest.

Ok, should I do the same?

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de