| Message ID | 20180926153505.3411-16-asafka7@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Fix python-crossbar to work with python 3.7 | expand |
Hello, + Thomas On Wed, Sep 26, 2018 at 12:34 PM, Asaf Kahlon wrote: [snip] > -PYTHON_TXTORCON_VERSION = 0.19.3 > +PYTHON_TXTORCON_VERSION = 18.0.2 In the upstream code there is an issue with Python 2: https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/102483482 |# python -c 'import txtorcon' |Traceback (most recent call last): | File "<string>", line 1, in <module> | File "usr/lib/python2.7/site-packages/txtorcon/__init__.py", line 16, in <module> | File "usr/lib/python2.7/site-packages/txtorcon/controller.py", line 43, in <module> |ImportError: No module named controller_py3 |# echo $? |1 Here is the relevant code: |try: | from .controller_py3 import _AsyncOnionAuthContext | HAVE_ASYNC = True |except SyntaxError: | HAVE_ASYNC = False The upstream has a patch related to this (I did not tested it): https://github.com/meejah/txtorcon/commit/c160531e885a3695ec1627070b6f48dfc443f3c8 and also there is a new release 18.1.0 containing it. Assuming the patch solves the issue, what would be the best approach in this case? - resend the remaining patches of the series, bumping directly to 18.1.0; - resend the remaining patches of the series, adding the upstream patch to the bump to 18.0.2; - apply the remaining patches of the series, and later add a followup patch to solve the runtime issue either by adding the patch file or by bumping to 18.1.0. Regards, Ricardo
Hello, On Sat, Sep 29, 2018 at 8:37 AM Ricardo Martincoski <ricardo.martincoski@gmail.com> wrote: > > Hello, > > + Thomas > > On Wed, Sep 26, 2018 at 12:34 PM, Asaf Kahlon wrote: > > [snip] > > -PYTHON_TXTORCON_VERSION = 0.19.3 > > +PYTHON_TXTORCON_VERSION = 18.0.2 > > In the upstream code there is an issue with Python 2: > https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/102483482 > |# python -c 'import txtorcon' > |Traceback (most recent call last): > | File "<string>", line 1, in <module> > | File "usr/lib/python2.7/site-packages/txtorcon/__init__.py", line 16, in <module> > | File "usr/lib/python2.7/site-packages/txtorcon/controller.py", line 43, in <module> > |ImportError: No module named controller_py3 > |# echo $? > |1 > > Here is the relevant code: > |try: > | from .controller_py3 import _AsyncOnionAuthContext > | HAVE_ASYNC = True > |except SyntaxError: > | HAVE_ASYNC = False > > The upstream has a patch related to this (I did not tested it): > https://github.com/meejah/txtorcon/commit/c160531e885a3695ec1627070b6f48dfc443f3c8 > and also there is a new release 18.1.0 containing it. > > Assuming the patch solves the issue, what would be the best approach in this > case? > - resend the remaining patches of the series, bumping directly to 18.1.0; > - resend the remaining patches of the series, adding the upstream patch to the > bump to 18.0.2; > - apply the remaining patches of the series, and later add a followup patch > to solve the runtime issue either by adding the patch file or by bumping to > 18.1.0. Regarding 18.0.2 with a patch vs. 18.1.0 - I would go with 18.1.0. If we can use a newer version and don't use a patch on Buildroot, so in my opinion it's preferred. Regarding the other patches of the series - it's possible to send the patches again, but since only one of them will be changed I would prefer applying the series (with or without that one), and then send a patch for 18.1.0. > > > Regards, > Ricardo Asaf
Hello, On Sat, 29 Sep 2018 02:37:28 -0300, Ricardo Martincoski wrote: > The upstream has a patch related to this (I did not tested it): > https://github.com/meejah/txtorcon/commit/c160531e885a3695ec1627070b6f48dfc443f3c8 > and also there is a new release 18.1.0 containing it. > > Assuming the patch solves the issue, what would be the best approach in this > case? > - resend the remaining patches of the series, bumping directly to 18.1.0; > - resend the remaining patches of the series, adding the upstream patch to the > bump to 18.0.2; > - apply the remaining patches of the series, and later add a followup patch > to solve the runtime issue either by adding the patch file or by bumping to > 18.1.0. This last option looks good to me. Best regards, Thomas
Hello, On Wed, 26 Sep 2018 18:34:57 +0300, Asaf Kahlon wrote: > Also add license hash. > > Signed-off-by: Asaf Kahlon <asafka7@gmail.com> > --- > package/python-txtorcon/python-txtorcon.hash | 9 +++++---- > package/python-txtorcon/python-txtorcon.mk | 4 ++-- > 2 files changed, 7 insertions(+), 6 deletions(-) As suggested by Ricardo, I have bumped to 18.1.0 instead of 1.8.0.2. I've added Yegor Reviewed-by and applied. Thanks! Thomas
diff --git a/package/python-txtorcon/python-txtorcon.hash b/package/python-txtorcon/python-txtorcon.hash index 71a2ec508f..ca43be5e7f 100644 --- a/package/python-txtorcon/python-txtorcon.hash +++ b/package/python-txtorcon/python-txtorcon.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/txtorcon/json, sha256 locally computed -md5 4d7380fa7e721c77cac103d971882374 txtorcon-0.19.3.tar.gz -sha256 f73396667909a3c7a98f4dd865edf4ed6a2518ee5a935d92e18b8a479ec244fd txtorcon-0.19.3.tar.gz -sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE +# md5, sha256 from https://pypi.org/pypi/txtorcon/json +md5 76ca73a069947726216477c8da75f798 txtorcon-18.0.2.tar.gz +sha256 ce50fdd00abb8b490b72809a2c664684f67f3c9467f392642d36f58309395a87 txtorcon-18.0.2.tar.gz +# Locally computed sha256 checksums +sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index f75f50438e..596a2da063 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXTORCON_VERSION = 0.19.3 +PYTHON_TXTORCON_VERSION = 18.0.2 PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz -PYTHON_TXTORCON_SITE = https://pypi.python.org/packages/05/4b/d2fbfdc08ab83c299f2ad22ba38ea35f71f1c966684f5754e079108a1f64 +PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/0d/cf/d60e12055c2930aa5a347043423e59e29241d03fd1f2316d1dea08db383a PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE
Also add license hash. Signed-off-by: Asaf Kahlon <asafka7@gmail.com> --- package/python-txtorcon/python-txtorcon.hash | 9 +++++---- package/python-txtorcon/python-txtorcon.mk | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)