Thanks, applied as 6a821a1e47860c35bcf8eba1868afaeec0c6da96. Michael
[sent from post-receive hook] On Fri, 17 Jul 2020 13:57:01 +0200, Philipp Zabel <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
