Merge lp:~caio1982/capomastro/fix-billiard-dhpython into lp:capomastro

[Caio Begotti]

Release a new package that fixes the dependency version of Billiard, not picked up by dh_python correctly.

With this fix we force Capomastro (and its new Celery beat code to support scheduled builds) to use Billiard 3.3.0.18-2, which has been backported by me, ans not 3.3.0.15, which is the version available in the repositories and that pydist expects to use by default.

Without this a package upgrade won't start up Capomastro correctly because of the version conflict.

[Zygmunt Krynicki (zyga)]

There are ways to do that better.

There's a file that pubuild reads and understands to map pypi deps to
debian deps.

On Thu, May 7, 2015 at 6:20 PM, Caio Begotti <email address hidden> wrote:
> Caio Begotti has proposed merging lp:~caio1982/capomastro/fix-billiard-dhpython into lp:capomastro.
>
> Commit message:
> Release a new package that fixes the dependency version of Billiard, not picked up by dh_python correctly.
>
> Requested reviews:
> Daniel Manrique (roadmr)
>
> For more details, see:
> https://code.launchpad.net/~caio1982/capomastro/fix-billiard-dhpython/+merge/258525
>
> With this fix we force Capomastro (and its new Celery beat code to support scheduled builds) to use Billiard 3.0.18-2, which has been backported by me, ans not 3.3.0.15, which is the version available in the repositories and that pydist expects to use by default.
>
> Without this a package upgrade won't start up Capomastro correctly because of the version conflict.
>
> --
> You are subscribed to branch lp:capomastro.
>
> === modified file 'debian/changelog'
> --- debian/changelog 2015-05-07 01:06:06 +0000
> +++ debian/changelog 2015-05-07 16:19:34 +0000
> @@ -1,3 +1,9 @@
> +capomastro (20150507) trusty; urgency=high
> +
> + * Fix the dependency version of Billiard, not picked up by dh_python.
> +
> + -- Caio Begotti <email address hidden> Thu, 07 May 2015 10:24:50 -0300
> +
> capomastro (20150506) trusty; urgency=high
>
> * Fix #1433354 (archiver creation not validating missing credentials)
>
> === modified file 'debian/control'
> --- debian/control 2015-04-09 14:56:23 +0000
> +++ debian/control 2015-05-07 16:19:34 +0000
> @@ -18,7 +18,8 @@
> rabbitmq-server,
> ${misc:Depends},
> ${python:Depends},
> - ${shlibs:Depends}
> + ${shlibs:Depends},
> + python-billiard (>= 3.3.0.18)
> Provides: python-librabbitmq
> Conflicts: python-librabbitmq
> Replaces: python-librabbitmq
>
>

[Daniel Manrique (roadmr)]

I've never heard about billiard :)

On the description you say:

With this fix we force Capomastro to use Billiard 3.0.18-2, which has been backported by me, ans not 3.3.0.15

but the diff below indicates that this is reversed and we *want* to use 3.3.0.15:

 python-billiard (>= 3.3.0.18)

Just want to make sure that this is clarified. The merge request looks OK in principle but since it directly conflicts with the description some clarification would be useful.

review: Needs Information

[Zygmunt Krynicki (zyga)]

Billard is a part of celery deps (older celery, now it is gone AFAIR)

On Thu, May 7, 2015 at 6:23 PM, Daniel Manrique
<email address hidden> wrote:
> Review: Needs Information
>
> I've never heard about billiard :)
>
> On the description you say:
>
> With this fix we force Capomastro to use Billiard 3.0.18-2, which has been backported by me, ans not 3.3.0.15
>
> but the diff below indicates that this is reversed and we *want* to use 3.3.0.15:
>
> python-billiard (>= 3.3.0.18)
>
> Just want to make sure that this is clarified. The merge request looks OK in principle but since it directly conflicts with the description some clarification would be useful.
> --
> https://code.launchpad.net/~caio1982/capomastro/fix-billiard-dhpython/+merge/258525
> You are subscribed to branch lp:capomastro.

[Zygmunt Krynicki (zyga)]

You want to look at

debian/pydist-overrides

On Thu, May 7, 2015 at 6:24 PM, Zygmunt Krynicki
<email address hidden> wrote:
> Billard is a part of celery deps (older celery, now it is gone AFAIR)
>
> On Thu, May 7, 2015 at 6:23 PM, Daniel Manrique
> <email address hidden> wrote:
>> Review: Needs Information
>>
>> I've never heard about billiard :)
>>
>> On the description you say:
>>
>> With this fix we force Capomastro to use Billiard 3.0.18-2, which has been backported by me, ans not 3.3.0.15
>>
>> but the diff below indicates that this is reversed and we *want* to use 3.3.0.15:
>>
>> python-billiard (>= 3.3.0.18)
>>
>> Just want to make sure that this is clarified. The merge request looks OK in principle but since it directly conflicts with the description some clarification would be useful.
>> --
>> https://code.launchpad.net/~caio1982/capomastro/fix-billiard-dhpython/+merge/258525
>> You are subscribed to branch lp:capomastro.
>
> --
> https://code.launchpad.net/~caio1982/capomastro/fix-billiard-dhpython/+merge/258525
> You are subscribed to branch lp:capomastro.

[Caio Begotti (caio1982)]

Zygmunt, this is exactly what the commit log says. The pydist override didn't work for Billiard, only direct deps of Capomastro could be overriden that way (as we currently do already).

Daniel, I didn't understand the question. That >= says we want any Billiard but not older than this 3.3.0.18. This makes Capomastro not to accept the current old 3.3.0.15. Perhaps it was just poor wording from my part?

[Zygmunt Krynicki (zyga)]

Ah, so you'd have to patch celery. Do you have a custom package for
celery as well?

[Caio Begotti (caio1982)]

No, just a simple version backport (to reduce temporary maintenance as
we don't expect to use these backports much longer).

On Thu, May 7, 2015 at 1:28 PM, Zygmunt Krynicki
<email address hidden> wrote:
> Ah, so you'd have to patch celery. Do you have a custom package for
> celery as well?

[Daniel Manrique (roadmr)]

OHH I see. The description says this:

to use Billiard 3.0.18-2, which has been backported by me, ans not 3.3.0.15

It should say this:

to use Billiard 3.3.0.18-2, which has been backported by me, ans not 3.3.0.15

(so 3.0.18 seemed older than 3.3.0.15, but 3.3.0.18 is clearly newer).

I'll fix the description in a second.

+1 from me, I'll give a bit for Zygmunt to comment on the pydist stuff but your explanation (and the commit message) make sense.

review: Approve

[Zygmunt Krynicki (zyga)]

It feels wrong that this is on an indirect dependency but feel free to
do it this way.

On Thu, May 7, 2015 at 6:33 PM, Daniel Manrique
<email address hidden> wrote:
> Review: Approve
>
> OHH I see. The description says this:
>
> to use Billiard 3.0.18-2, which has been backported by me, ans not 3.3.0.15
>
> It should say this:
>
> to use Billiard 3.3.0.18-2, which has been backported by me, ans not 3.3.0.15
>
> (so 3.0.18 seemed older than 3.3.0.15, but 3.3.0.18 is clearly newer).
>
> I'll fix the description in a second.
>
> +1 from me, I'll give a bit for Zygmunt to comment on the pydist stuff but your explanation (and the commit message) make sense.
> --
> https://code.launchpad.net/~caio1982/capomastro/fix-billiard-dhpython/+merge/258525
> You are subscribed to branch lp:capomastro.

[Caio Begotti (caio1982)]

I also wish we could fix it in pydist-overrides directly, but we can't afford maintaining a patched Celery right now.

Daniel, are you okay with this to merge?

[Daniel Manrique (roadmr)]

Yep, I think we all agree this is suboptimal :/ it will have to do for now. Let's merge this.

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-07 01:06:06 +0000
+++ debian/changelog	2015-05-07 17:19:42 +0000
@@ -1,3 +1,9 @@
+capomastro (20150507) trusty; urgency=high
+
+  * Fix the dependency version of Billiard, not picked up by dh_python.
+
+ -- Caio Begotti <[e-mail]>  Thu, 07 May 2015 10:24:50 -0300
+
 capomastro (20150506) trusty; urgency=high
 
   * Fix #1433354 (archiver creation not validating missing credentials)

=== modified file 'debian/control'
--- debian/control	2015-04-09 14:56:23 +0000
+++ debian/control	2015-05-07 17:19:42 +0000
@@ -18,7 +18,8 @@
          rabbitmq-server,
          ${misc:Depends},
          ${python:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+	 python-billiard (>= 3.3.0.18)
 Provides: python-librabbitmq
 Conflicts: python-librabbitmq
 Replaces: python-librabbitmq

=== modified file 'docs/source/setup.rst'
--- docs/source/setup.rst	2015-03-16 16:06:52 +0000
+++ docs/source/setup.rst	2015-05-07 17:19:42 +0000
@@ -120,3 +120,4 @@
 All code is actually validated through the application package, so although you
 can test and develop things really locally, only code from packages is
 considered deployable.
+