[Bigbang-dev] merging changes upstream

[Niels ten Oever]

Hi all,

I opened (a bit messy) PR. I had a hard time understanding how I could
cherry pick different commits to make it more structured. So if you
think I should re-do it, please share a link with me on some guidance :)

Thanks,

Niels

Niels ten Oever
Head of Digital

Article 19
www.article19.org

PGP fingerprint    2458 0B70 5C4A FD8A 9488
                   643A 0ED8 3F3A 468A C8B3

On 08/23/2017 12:17 AM, Sebastian Benthall wrote:
> Nick, thanks so much for this.
> I promise to review #281 this week.
> 
> 
> On Aug 18, 2017 6:24 PM, "Nick Doty" <npdoty at ischool.berkeley.edu
> <mailto:npdoty at ischool.berkeley.edu>> wrote:
> 
>     I think we should probably try to prioritize merging all our
>     personal changes back into datactive/bigbang. It seems like the
>     longer we delay, the more painful the merges will be and in the
>     meantime we're missing out on the improvements that other
>     individuals have made.
> 
>     I see 3 open pull requests on the datactive/bigbang.
> 
>     1. Seb, are you able to review my #281?
> 
>     2. I provided some review comments on #273 which haven't been
>     updated yet, but I'm not using conda so I can't easily test that
>     setup process.
> 
>     3. And #279 is an error-handling change which shouldn't be too hard
>     to review and integrate. Any volunteers on that one? Or I may be
>     able to review it as I've been doing some mail collection
>     error-handling work recently too.
> 
>     4. Niels, could you open one or more PRs with your changes? I can
>     serve as reviewer.
> 
>     I think a hackathon this year is a fine idea, but I think we should
>     do this merging work well before that as it's not generally the kind
>     of work that benefits from a hackathon environment and it could get
>     us in a more stable place which would benefit a hackathon's many
>     participants.
> 
>     Thanks,
>     Nick
> 
>     > On Aug 11, 2017, at 7:08 AM, Niels ten Oever <niels at article19.org
>     <mailto:niels at article19.org>> wrote:
>     >
>     > I am very sorry that the Datactive fork is still (far) behind my
>     personal fork. We do want to organize a hackathon on this, RIPE has
>     shown interest in support this work, so hopefully we can organize
>     something to work on this before the end of the year.
>     >
>     > On Tue, Aug 01, 2017 at 04:50:03PM -0700, Nick Doty wrote:
>     >>
>     >> I could try to create a minimal PR, but that's getting harder for
>     me as datactive/bigbang's master branch has not been updated in a
>     long time and my code may rely on other changes I've made in
>     intervening months.
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ghserv.net/pipermail/bigbang-dev/attachments/20170825/cc6de3fb/attachment.sig>