Merge lp:~brendan-donegan/checkbox-certification/bug1274094 into lp:checkbox-certification

[Brendan Donegan]

Remove dependency on checkbox from checkbox-certification-tools (because it doesn't strictly speaking require checkbox to function), but add python3-requests, because it does need that to function.

[Daniel Manrique (roadmr)]

Ah, why are the bluray changes sneaking into this MR?

[Zygmunt Krynicki (zyga)]

I guess it needs fixin'

review: Needs Fixing

[Brendan Donegan (brendan-donegan)]

Bug in git-bzr-ng? I'll redo this one

[Zygmunt Krynicki (zyga)]

IMHO git-bzr-ng is only useful for one-way trips.

Thanks
ZK

On Sat, Feb 1, 2014 at 12:23 AM, Brendan Donegan <
<email address hidden>> wrote:

> Bug in git-bzr-ng? I'll redo this one
> --
>
> https://code.launchpad.net/~brendan-donegan/checkbox-certification/bug1274094/+merge/204360
> You are reviewing the proposed merge of
> lp:~brendan-donegan/checkbox-certification/bug1274094 into
> lp:checkbox-certification.
>

[Brendan Donegan (brendan-donegan)]

Redid it with good old bzr, for now

review: Needs Resubmitting

[Daniel Manrique (roadmr)]

Hm, changelog says:

+ * Changed python3 to python3-all in Build-Depends.

but I don't see that change. Was that intentional?

The rest looks fine, let's clarify this and we can merge.

review: Needs Information

[Brendan Donegan (brendan-donegan)]

I was fixing the changelog, but might need to do a bit more - @zyga, do you know why version 0.18 is missing in trunk and the build-depends fix that was in that revision was moved to 0.19?

review: Needs Information

[Zygmunt Krynicki (zyga)]

No idea. I'll check this at home
1 lut 2014 10:14 "Brendan Donegan" <email address hidden>
napisał(a):

> Review: Needs Information
>
> I was fixing the changelog, but might need to do a bit more - @zyga, do
> you know why version 0.18 is missing in trunk and the build-depends fix
> that was in that revision was moved to 0.19?
> --
>
> https://code.launchpad.net/~brendan-donegan/checkbox-certification/bug1274094/+merge/204360
> You are reviewing the proposed merge of
> lp:~brendan-donegan/checkbox-certification/bug1274094 into
> lp:checkbox-certification.
>

[Brendan Donegan (brendan-donegan)]

I think you forgot the 'dch -r' step when cutting the release. If you run 'dch -i -U' when the current revision is UNRELEASED it just increments the version number instead of adding a new revision. I think I'll probably rework the documentation to ask to use the script in hwcert-tools - it's mature enough now and ensures steps won't be missed.

> No idea. I'll check this at home
> 1 lut 2014 10:14 "Brendan Donegan" <email address hidden>
> napisał(a):
>
> > Review: Needs Information
> >
> > I was fixing the changelog, but might need to do a bit more - @zyga, do
> > you know why version 0.18 is missing in trunk and the build-depends fix
> > that was in that revision was moved to 0.19?
> > --
> >
> > https://code.launchpad.net/~brendan-donegan/checkbox-
> certification/bug1274094/+merge/204360
> > You are reviewing the proposed merge of
> > lp:~brendan-donegan/checkbox-certification/bug1274094 into
> > lp:checkbox-certification.
> >

[Zygmunt Krynicki (zyga)]

Hmm.

I'm sure I did follow the directions step by step but I might have made a
mistake. I think we should stop doing it manually, just really script
everything and fix it until we just blindly run the script.

Thanks
ZK

On Sat, Feb 1, 2014 at 3:36 PM, Brendan Donegan <
<email address hidden>> wrote:

> I think you forgot the 'dch -r' step when cutting the release. If you run
> 'dch -i -U' when the current revision is UNRELEASED it just increments the
> version number instead of adding a new revision. I think I'll probably
> rework the documentation to ask to use the script in hwcert-tools - it's
> mature enough now and ensures steps won't be missed.
>
> > No idea. I'll check this at home
> > 1 lut 2014 10:14 "Brendan Donegan" <email address hidden>
> > napisał(a):
> >
> > > Review: Needs Information
> > >
> > > I was fixing the changelog, but might need to do a bit more - @zyga, do
> > > you know why version 0.18 is missing in trunk and the build-depends fix
> > > that was in that revision was moved to 0.19?
> > > --
> > >
> > > https://code.launchpad.net/~brendan-donegan/checkbox-
> > certification/bug1274094/+merge/204360
> > > You are reviewing the proposed merge of
> > > lp:~brendan-donegan/checkbox-certification/bug1274094 into
> > > lp:checkbox-certification.
> > >
> --
>
> https://code.launchpad.net/~brendan-donegan/checkbox-certification/bug1274094/+merge/204360
> You are reviewing the proposed merge of
> lp:~brendan-donegan/checkbox-certification/bug1274094 into
> lp:checkbox-certification.
>

[Brendan Donegan (brendan-donegan)]

This should be ok now - I guess the changelog is what it is at this point.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

Looks good.

review: Approve

[Daniel Manrique (roadmr)]

Attempt to merge into lp:checkbox-certification failed due to conflicts:

text conflict in debian/changelog

[Daniel Manrique (roadmr)]

Attempt to merge into lp:checkbox-certification failed due to conflicts:

text conflict in debian/changelog

[Daniel Manrique (roadmr)]

It's not obvious in the launchpad diff, but here's the conflict:

  [ Brendan Donegan ]

  * Changed python3 to python3-all in Build-Depends.
<<<<<<<
  * Removed whitelists because they're now in checkbox.
=======
  * Removed dependency on checkbox from checkbox-certification-tools
>>>>>>>
    and added a dependency on python3-requests (LP: #1274094)

review: Needs Fixing

[Daniel Manrique (roadmr)]

To lighten Brendan's workload, I fixed the changelog and submitted this here:

https://code.launchpad.net/~roadmr/checkbox-certification/bug1274094/+merge/221237

Thus I'll reject this MR to have it drop off our radars.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-28 02:10:30 +0000
+++ debian/changelog	2014-01-31 23:26:55 +0000
@@ -2,10 +2,9 @@
 
   [ Brendan Donegan ]
 
-  * Changed python3 to python3-all in Build-Depends. 
-
-  [ Zygmunt Krynicki ]
-  * Incremented changelog
+  * Changed python3 to python3-all in Build-Depends.
+  * Removed dependency on checkbox from checkbox-certification-tools
+    and added a dependency on python3-requests (LP: #1274094)
 
  -- Zygmunt Krynicki <[e-mail]>  Tue, 28 Jan 2014 03:10:26 +0100
 

=== modified file 'debian/control'
--- debian/control	2014-01-17 16:59:28 +0000
+++ debian/control	2014-01-31 23:26:55 +0000
@@ -55,7 +55,7 @@
 Section: python
 Architecture: all
 Priority: standard
-Depends: checkbox (>= 0.16~ppa), python3-pkg-resources, ${python3:Depends}
+Depends: python3-pkg-resources, python3-requests, ${python3:Depends}
 Description: Checkbox Certification Tools
  This package contains additional, useful tools to aid in the certification
  process.