Tanguy Le Carrour (3): gnu: python-os-testr: Add python-testrepository to inputs. gnu: poetry: Fix package inputs. gnu: python-msgpack-transitional: Remove unused variable. gnu/packages/openstack.scm | 3 ++- gnu/packages/python-xyz.scm | 31 +++---------------------------- 2 files changed, 5 insertions(+), 29 deletions(-) -- 2.34.0
This fixes a build failure in the 'sanity-check' phase. * gnu/packages/openstack.scm (python-os-testr)[native-inputs]: Add python-testrepository. --- gnu/packages/openstack.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index b0395fd7d0..a0322c9914 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2022 Tanguy Le Carrour <tanguy@bioneland.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -270,7 +271,7 @@ (define-public python-os-testr (propagated-inputs (list python-subunit)) (native-inputs - (list python-pbr python-testtools python-babel)) + (list python-pbr python-testtools python-babel python-testrepository)) (home-page "https://www.openstack.org/") (synopsis "Testr wrapper to provide functionality for OpenStack projects") (description -- 2.34.0
* gnu/packages/python-xyz.scm (python-msgpack-transitional)[arguments]: Replace references to deprecated Python methods. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bea33cbf05..40c9e30969 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10688,6 +10688,11 @@ (define-public python-msgpack-transitional (substitute* "setup.py" (("TRANSITIONAL = False") "TRANSITIONAL = 1")) + ;; This old version is not compatible with Python 3.9 + (substitute* '("test/test_buffer.py" "test/test_extension.py") + ((".tostring\\(") ".tobytes(")) + (substitute* '("test/test_buffer.py" "test/test_extension.py") + ((".fromstring\\(") ".frombytes(")) #t)))))))) (define-public python2-msgpack -- 2.34.0
* gnu/packages/python-xyz.scm (poetry)[propagated-inputs]: Add python-crashtest and python-entrypoints. Remove python-clikit. [WIP] re-add python-msgpack-transitional to make poetry work --- gnu/packages/python-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 40c9e30969..57f5a4eddd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15832,7 +15832,8 @@ (define-public poetry (list python-cachecontrol python-cachy python-cleo - python-clikit + python-crashtest + python-entrypoints python-html5lib python-keyring python-msgpack-transitional -- 2.34.0
Hi,
Tanguy Le Carrour <tanguy@bioneland.org> skribis:
> gnu: python-os-testr: Add python-testrepository to inputs.
> gnu: poetry: Fix package inputs.
> gnu: python-msgpack-transitional: Remove unused variable.
Applied, minus the “[WIP]” comment in the last commit log.
Thanks!
Ludo’.
On Thu, Jan 06, 2022 at 03:33:58PM +0100, Tanguy Le Carrour wrote:
> * gnu/packages/python-xyz.scm (python-msgpack-transitional)[arguments]:
> Replace references to deprecated Python methods.
Thanks for taking care of this package. I saw that this patch was
applied as commit d07d3ea008d24f8ad5f4f32f86cb1f89226123ae.
Are you using this package? It has no uses within Guix, so we could
remove it.
Hi Ludo’,
Quoting Ludovic Courtès (2022-01-11 18:55:28)
> Hi,
>
> Tanguy Le Carrour <tanguy@bioneland.org> skribis:
>
> > gnu: python-os-testr: Add python-testrepository to inputs.
> > gnu: poetry: Fix package inputs.
> > gnu: python-msgpack-transitional: Remove unused variable.
>
> Applied, minus the “[WIP]” comment in the last commit log.
*ERF*… my bad! Thanks for watching out! :-)
--
Tanguy
Hi Leo, Quoting Leo Famulari (2022-01-11 20:51:15) > On Thu, Jan 06, 2022 at 03:33:58PM +0100, Tanguy Le Carrour wrote: > > * gnu/packages/python-xyz.scm (python-msgpack-transitional)[arguments]: > > Replace references to deprecated Python methods. > > Thanks for taking care of this package. I saw that this patch was > applied as commit d07d3ea008d24f8ad5f4f32f86cb1f89226123ae. > > Are you using this package? It has no uses within Guix, so we could > remove it. I was supposed to removed it, indeed! But, apparently, I messed up the patch set! :-( The thing is, in the bug report, there's a mention to the patch set I was supposed to push as a v2, but I don't know where it comes from if the v2 was not actually sent?! ``` > gnu: python-os-testr: Add python-testrepository to inputs. > gnu: poetry: Fix package inputs. > gnu: python-msgpack-transitional: Remove unused variable. ``` Unfortunatly, Ludo applied it already! My bad! … I'll fix my mess and push the fix. Sorry guys! :-( -- Tanguy
On Wed, Jan 12, 2022 at 09:10:28AM +0100, Tanguy LE CARROUR wrote:
> … I'll fix my mess and push the fix. Sorry guys! :-(
No worries, I removed it in commit d5ae6739fdb4786c49d33de3fec9872c73d2e311
And I removed python2-msgpack in the subsequent commit.
Hi Leo,
Quoting Leo Famulari (2022-01-12 19:35:51)
> On Wed, Jan 12, 2022 at 09:10:28AM +0100, Tanguy LE CARROUR wrote:
> > … I'll fix my mess and push the fix. Sorry guys! :-(
>
> No worries, I removed it in commit d5ae6739fdb4786c49d33de3fec9872c73d2e311
>
> And I removed python2-msgpack in the subsequent commit.
Thanks!
--
Tanguy
Hi Leo,
Quoting Tanguy LE CARROUR (2022-01-12 09:10:28)
> Quoting Leo Famulari (2022-01-11 20:51:15)
> > On Thu, Jan 06, 2022 at 03:33:58PM +0100, Tanguy Le Carrour wrote:
> > > * gnu/packages/python-xyz.scm (python-msgpack-transitional)[arguments]:
> > > Replace references to deprecated Python methods.
> >
> > Thanks for taking care of this package. I saw that this patch was
> > applied as commit d07d3ea008d24f8ad5f4f32f86cb1f89226123ae.
> >
> > Are you using this package? It has no uses within Guix, so we could
> > remove it.
>
> I was supposed to removed it, indeed!
> But, apparently, I messed up the patch set! :-(
>
> The thing is, in the bug report, there's a mention to the patch set I
> was supposed to push as a v2, but I don't know where it comes from if
> the v2 was not actually sent?!
>
> ```
> > gnu: python-os-testr: Add python-testrepository to inputs.
> > gnu: poetry: Fix package inputs.
> > gnu: python-msgpack-transitional: Remove unused variable.
> ```
>
> Unfortunatly, Ludo applied it already! My bad!
>
> … I'll fix my mess and push the fix. Sorry guys! :-(
I've submitted a patch set (#53228) to, I hope, fix my mess!
I'm closing this one.
Regards,
--
Tanguy