From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jtSe2-0003Dr-7H for ptxdist@pengutronix.de; Thu, 09 Jul 2020 11:15:06 +0200 From: Philipp Zabel Date: Thu, 9 Jul 2020 11:15:05 +0200 Message-Id: <20200709091505.30053-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH] python3-zipp: fix missing version in setup.py List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de 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 --- rules/python3-zipp.make | 6 ++++++ 1 file changed, 6 insertions(+) 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 # ---------------------------------------------------------------------------- -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de