[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[James Hilliard]

Autobahn recently added a feature called xbr which we don't support,
let's remove this before building autobahn.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/python-autobahn/python-autobahn.hash |  4 ++--
 package/python-autobahn/python-autobahn.mk   | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash
index a49de07b70..a5aa2a5a7d 100644
--- a/package/python-autobahn/python-autobahn.hash
+++ b/package/python-autobahn/python-autobahn.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/autobahn/json
-md5  9702594ee1c5613e9bb31af105140b5b  autobahn-20.4.2.tar.gz
-sha256  1c943f94bb759c07445a6984a3bc4c76f73e2a90a1fc2c3521c211579b73d3db  autobahn-20.4.2.tar.gz
+md5  dcae3cf26203aa4bbd9912137e5c9512  autobahn-20.4.3.tar.gz
+sha256  c6fe745d52ba9f9eecf791cd31f558df42aebfc4f9ee558a8f1d18c707e1ae1f  autobahn-20.4.3.tar.gz
 # Locally computed sha256 checksums
 sha256  0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef  LICENSE
diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk
index d4e52352f2..dc9290b1cd 100644
--- a/package/python-autobahn/python-autobahn.mk
+++ b/package/python-autobahn/python-autobahn.mk
@@ -4,11 +4,23 @@
 #
 ################################################################################
 
-PYTHON_AUTOBAHN_VERSION = 20.4.2
+PYTHON_AUTOBAHN_VERSION = 20.4.3
 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz
-PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/13/0e/b182b46ea437e59003de78c68bb00824d304dcfe58e7235f29c4f275eca0
+PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/cb/16/38d27874ef827974f44acb6dd64a92a9248b624734c0e84b91083c2d9350
 PYTHON_AUTOBAHN_LICENSE = MIT
 PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE
 PYTHON_AUTOBAHN_SETUP_TYPE = setuptools
 
+define PYTHON_AUTOBAHN_REMOVE_XBR
+	rm -rf $(@D)/autobahn/xbr
+	rm -f $(@D)/autobahn/asyncio/xbr.py
+	rm -f $(@D)/autobahn/twisted/xbr.py
+	sed -i -e "/'autobahn\.xbr',/d" $(@D)/setup.py
+	sed -i -e "/'xbr': \['\.\/xbr\/contracts\/\*\.json'\],/d" $(@D)/setup.py
+	sed -i -e '/"xbrnetwork = autobahn\.xbr\._cli:_main",/d' $(@D)/setup.py
+	sed -i -e '/xbr/d' $(@D)/MANIFEST.in
+endef
+
+PYTHON_AUTOBAHN_POST_EXTRACT_HOOKS = PYTHON_AUTOBAHN_REMOVE_XBR
+
 $(eval $(python-package))
-- 
2.20.1

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[Thomas Petazzoni]

On Fri, 24 Apr 2020 16:47:52 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> Autobahn recently added a feature called xbr which we don't support,
> let's remove this before building autobahn.

Why don't we support it? Can it be made optional in a way that is
acceptable upstream?

> +define PYTHON_AUTOBAHN_REMOVE_XBR
> +	rm -rf $(@D)/autobahn/xbr
> +	rm -f $(@D)/autobahn/asyncio/xbr.py
> +	rm -f $(@D)/autobahn/twisted/xbr.py
> +	sed -i -e "/'autobahn\.xbr',/d" $(@D)/setup.py
> +	sed -i -e "/'xbr': \['\.\/xbr\/contracts\/\*\.json'\],/d" $(@D)/setup.py
> +	sed -i -e '/"xbrnetwork = autobahn\.xbr\._cli:_main",/d' $(@D)/setup.py
> +	sed -i -e '/xbr/d' $(@D)/MANIFEST.in
> +endef

Urgh, we want a patch, not tweaks like that. I guess perhaps the patch
doesn't need to remove the actual source files, just remove the
handling in setup.py.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[James Hilliard]

On Sat, Apr 25, 2020 at 7:30 AM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Fri, 24 Apr 2020 16:47:52 -0600
> James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > Autobahn recently added a feature called xbr which we don't support,
> > let's remove this before building autobahn.
>
> Why don't we support it? Can it be made optional in a way that is
> acceptable upstream?
This feature is very dependency heavy to begin with(we don't have
buildroot packages for most) and not relevant to most autobahn use
cases.
I just got something merged upstream which should simplify stripping
xbr however.
>
> > +define PYTHON_AUTOBAHN_REMOVE_XBR
> > +     rm -rf $(@D)/autobahn/xbr
> > +     rm -f $(@D)/autobahn/asyncio/xbr.py
> > +     rm -f $(@D)/autobahn/twisted/xbr.py
> > +     sed -i -e "/'autobahn\.xbr',/d" $(@D)/setup.py
> > +     sed -i -e "/'xbr': \['\.\/xbr\/contracts\/\*\.json'\],/d" $(@D)/setup.py
> > +     sed -i -e '/"xbrnetwork = autobahn\.xbr\._cli:_main",/d' $(@D)/setup.py
> > +     sed -i -e '/xbr/d' $(@D)/MANIFEST.in
> > +endef
>
> Urgh, we want a patch, not tweaks like that. I guess perhaps the patch
> doesn't need to remove the actual source files, just remove the
> handling in setup.py.
I'll respin this once upstream has a new release with the ENV variable I
added that strips xbr during installation, not stripping xbr results in a fairly
large target size increase, nearly 10MB from the looks of it.
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[Thomas Petazzoni]

Hello James,

On Sat, 25 Apr 2020 13:31:31 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> > Why don't we support it? Can it be made optional in a way that is
> > acceptable upstream?  
> This feature is very dependency heavy to begin with(we don't have
> buildroot packages for most) and not relevant to most autobahn use
> cases.

OK.

> I just got something merged upstream which should simplify stripping
> xbr however.

Would be good, indeed.

> > Urgh, we want a patch, not tweaks like that. I guess perhaps the patch
> > doesn't need to remove the actual source files, just remove the
> > handling in setup.py.  
> I'll respin this once upstream has a new release with the ENV variable I
> added that strips xbr during installation, not stripping xbr results in a fairly
> large target size increase, nearly 10MB from the looks of it.

Sounds good. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[James Hilliard]

On Sat, Apr 25, 2020 at 1:53 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello James,
>
> On Sat, 25 Apr 2020 13:31:31 -0600
> James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > > Why don't we support it? Can it be made optional in a way that is
> > > acceptable upstream?
> > This feature is very dependency heavy to begin with(we don't have
> > buildroot packages for most) and not relevant to most autobahn use
> > cases.
>
> OK.
>
> > I just got something merged upstream which should simplify stripping
> > xbr however.
>
> Would be good, indeed.
>
> > > Urgh, we want a patch, not tweaks like that. I guess perhaps the patch
> > > doesn't need to remove the actual source files, just remove the
> > > handling in setup.py.
> > I'll respin this once upstream has a new release with the ENV variable I
> > added that strips xbr during installation, not stripping xbr results in a fairly
> > large target size increase, nearly 10MB from the looks of it.
>
> Sounds good. Thanks!
If you'd like you can merge just the version bump part without the xbr strip
for now.
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[Thomas Petazzoni]

On Sat, 25 Apr 2020 13:55:52 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> If you'd like you can merge just the version bump part without the xbr strip
> for now.

But you said we don't have what is needed for xbr. Or is that "just"
runtime dependencies that are missing?

If that really brings 10 MB of additional useless stuff, I think I'd
prefer to hold off on the version bump, and do it once there is a good
solution to avoid installing xbr.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[James Hilliard]

On Sat, Apr 25, 2020 at 2:09 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Sat, 25 Apr 2020 13:55:52 -0600
> James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > If you'd like you can merge just the version bump part without the xbr strip
> > for now.
>
> But you said we don't have what is needed for xbr. Or is that "just"
> runtime dependencies that are missing?
Yeah, it's runtime dependencies.
>
> If that really brings 10 MB of additional useless stuff, I think I'd
> prefer to hold off on the version bump, and do it once there is a good
> solution to avoid installing xbr.
>
It doesn't make a difference since the current version also has xbr.
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

[Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 20.4.3

[Thomas Petazzoni]

On Sat, 25 Apr 2020 15:07:56 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> > If that really brings 10 MB of additional useless stuff, I think I'd
> > prefer to hold off on the version bump, and do it once there is a good
> > solution to avoid installing xbr.
> >  
> It doesn't make a difference since the current version also has xbr.

Ah, then your patch should have been split into two, in the first
place. One for the version bump, one for the xdr cleanup/removal.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com