From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20200709091505.30053-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1jwOz7-0004yV-PX@dude02.hi.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 17 Jul 2020 13:57:01 +0200
Subject: Re: [ptxdist] [APPLIED] python3-zipp: fix missing version in
 setup.py
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=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" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <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