From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] python3-zipp: fix missing version in setup.py
Date: Fri, 17 Jul 2020 13:57:01 +0200 [thread overview]
Message-ID: <E1jwOz7-0004yV-PX@dude02.hi.pengutronix.de> (raw)
In-Reply-To: <20200709091505.30053-1-p.zabel@pengutronix.de>
Thanks, applied as 6a821a1e47860c35bcf8eba1868afaeec0c6da96.
Michael
[sent from post-receive hook]
On Fri, 17 Jul 2020 13:57:01 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> zipp.egg-info/PKG-INFO contains the correct version, but it is
> overwritten to 0.0.0 by setup.py build if not set in setup.cfg.
> Fixes the following error when running pytest:
>
> Traceback (most recent call last):
> File "/usr/lib/python3.7/site-packages/pkg_resources/__init__.py", line 583, in _build_master
> File "/usr/lib/python3.7/site-packages/pkg_resources/__init__.py", line 900, in require
> File "/usr/lib/python3.7/site-packages/pkg_resources/__init__.py", line 791, in resolve
> pkg_resources.ContextualVersionConflict: (zipp 0.0.0 (/usr/lib/python3.7/site-packages), Requirement.parse('zipp>=0.5'), {'importlib-metadata'})
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200709091505.30053-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/python3-zipp.make b/rules/python3-zipp.make
> index bd43b1b3bd9a..a743971e9847 100644
> --- a/rules/python3-zipp.make
> +++ b/rules/python3-zipp.make
> @@ -31,6 +31,12 @@ PYTHON3_ZIPP_LICENSE_FILES := \
>
> PYTHON3_ZIPP_CONF_TOOL := python3
>
> +$(STATEDIR)/python3-zipp.extract.post:
> + @$(call targetinfo)
> + @$(call world/patchin/post, PYTHON3_ZIPP)
> + @sed -i '/^name =/aversion = $(PYTHON3_ZIPP_VERSION)' $(PYTHON3_ZIPP_DIR)/setup.cfg
> + @$(call touch)
> +
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2020-07-17 11:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 9:15 [ptxdist] [PATCH] " Philipp Zabel
2020-07-17 11:57 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1jwOz7-0004yV-PX@dude02.hi.pengutronix.de \
--to=mol@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox