SpamapS | alright, not so bad once I got into it | 00:23 |
---|---|---|
* SpamapS pushes fix for SSL cert verification into juju | 00:24 | |
hazmat | SpamapS, woot! | 00:43 |
hazmat | SpamapS, meld is your friend on the nasty merges | 00:43 |
hazmat | i typically invoke via bzr qconflicts | 00:43 |
SpamapS | hazmat: none of it was really nasty actually. We both just legitimately changed the same path in a lot of places, but luckily it never got that ugly | 00:43 |
SpamapS | most of it was that get_current_ami changed to something much more elegant.. | 00:44 |
SpamapS | and what I did was very non-intrusive.. | 00:44 |
SpamapS | hazmat: oo, never used that | 00:44 |
SpamapS | hazmat: know any good tools for analyzing aggregate code stats for python? | 00:44 |
SpamapS | I am putting together a little retrospective for the evolution of the juju codebase over the last 6 months. | 00:45 |
hazmat | SpamapS, you mean want LOC over time? | 00:47 |
* hazmat gives up on english | 00:47 | |
SpamapS | LOC and maybe test coverage though I know I have to actually *run* the tests to do that | 00:47 |
SpamapS | hazmat: I can find a lot of tools to do per-file stats | 00:49 |
SpamapS | but I just want to point at a dir and get some interesting numbers | 00:49 |
hazmat | SpamapS, nothing python specific comes to mind for that.. you could try just pushing it to ohloh | 00:49 |
SpamapS | oooo | 00:50 |
SpamapS | yeah that might work :) | 00:50 |
SpamapS | argh.. yet another site to login to | 00:51 |
hazmat | SpamapS, else.. scripting http://cloc.sourceforge.net/ with bzr -u revno | 00:54 |
SpamapS | hazmat: 96 test coverage... not too shabby | 00:56 |
SpamapS | 96% I should say | 00:57 |
SpamapS | ahh and the worst file is juju/lib/lxc/__init__ .. which would be better if I had not skipped those tests :) | 00:57 |
hazmat | yeah.. we dropped 2% since last release | 00:59 |
hazmat | sloppy ;-) | 00:59 |
SpamapS | I got really weird errors when running coverage tests | 01:01 |
SpamapS | exceptions.IOError: /usr/lib/python2.7/dist-packages/ubuntuone-storage-protocol/juju/hooks/tests/hooks/success-hook doesn't exist | 01:01 |
hazmat | huh | 01:03 |
hazmat | odd path | 01:03 |
hazmat | SpamapS, via make coverage? | 01:03 |
SpamapS | https://www.ohloh.net/p/juju | 01:05 |
SpamapS | hazmat: yeah | 01:05 |
hazmat | SpamapS, haven't seen that one before | 01:07 |
SpamapS | Step 2 of 3: Importing source code into database (Running 0/1) | 01:08 |
SpamapS | *get on with it!* ;) | 01:08 |
hazmat | bcsaller, the latest lbox diff looks off | 01:11 |
bcsaller | when doesn't it | 01:11 |
bcsaller | I'll take a look | 01:11 |
hazmat | ic some of the changes that jimbaker made in that diff that are on trunk | 01:11 |
bcsaller | hazmat: which branch are you looking at? | 01:12 |
hazmat | https://codereview.appspot.com/5892046/ | 01:12 |
hazmat | bcsaller, the pre-req needs to have trunk merged | 01:12 |
hazmat | lp gets the diff wrong as well.. say its 7k | 01:14 |
hazmat | bcsaller, might be easiest to just remove the pre-requiste on the mp and run lbox again | 01:15 |
hazmat | but getting the pre-req merged to current trunk should also work | 01:15 |
* hazmat is tired | 01:16 | |
hazmat | beer o'clock back in a bit | 01:16 |
hazmat | bcsaller, can you run lbox again | 02:19 |
bcsaller | hazmat: I had, you think it will be different if I do it again? | 02:20 |
hazmat | bcsaller, i modified the mp | 02:20 |
hazmat | just now | 02:20 |
bcsaller | ahh, ok, running it now, for both | 02:20 |
hazmat | bcsaller both? | 02:21 |
hazmat | bcsaller, btw the problem b4, was you had to push the pre-req branch to lp after merging trunk | 02:21 |
hazmat | lbox pulls there for the pre-req | 02:21 |
bcsaller | https://codereview.appspot.com/5892046 and https://codereview.appspot.com/5991079 | 02:21 |
bcsaller | though the later includes the former | 02:22 |
hazmat | merging it locally doesn't do anything by itself | 02:22 |
bcsaller | I proposed both before as well | 02:22 |
hazmat | bcsaller, the status branch which is the pre-req for agent wasn't pushed | 02:33 |
hazmat | with a trunk merge | 02:33 |
* hazmat calls it a night | 02:33 | |
bcsaller | I thought that was merged | 02:33 |
bcsaller | maybe it didn't detect that | 02:33 |
bcsaller | I think the problem is the pre-req stays around even after merge and it shouldn't when the merge is with the lbox propose -for target | 02:40 |
wrtp | mornin' all | 07:55 |
TheMue | wrtp: morning | 07:57 |
fwereade_ | morning wrtp, TheMue | 08:16 |
TheMue | heya fwereade_ | 08:16 |
wrtp | fwereade_, TheMue: hiya. hope you've had a good time over Easter. | 08:16 |
fwereade_ | wrtp, lovely, thanks; and yourself? | 08:17 |
wrtp | fwereade_: just great. we even had *some* nice weather at the start (the rest was a bit shit tbh) | 08:17 |
fwereade_ | wrtp, cool | 08:18 |
fwereade_ | wrtp, I forget, what was it you were doing | 08:18 |
fwereade_ | ? | 08:18 |
wrtp | fwereade_: went up north, to skye (where my folks live) via the ardnamurchan pensinsula with our bikes. | 08:19 |
wrtp | fwereade_: so shitty weather is par for the course | 08:22 |
TheMue | wrtp: ah, skye, home of good malts | 08:22 |
wrtp | TheMue: only one malt really :-) | 08:23 |
fwereade_ | wrtp, indeed, but I must say that I've always found bikes to be an unpleasantness multiplier for shitty weather | 08:23 |
wrtp | TheMue: distilled about 3 miles from where my parents live... | 08:23 |
wrtp | fwereade_: luckily we had the good weather at the start when we were on the bikes | 08:23 |
fwereade_ | wrtp, perfect :) | 08:24 |
wrtp | fwereade_: here was a photo i took on my phone about half way through the longest day trip. we'd just come along the coast (mostly walking as our mountain bike skillz are not sufficiently l33t): https://www.facebook.com/photo.php?fbid=10150779643720903&set=a.445021760902.235579.754250902&type=3&theater | 08:26 |
fwereade_ | wrtp, that's lovely | 08:27 |
=== TheMue_ is now known as TheMue | ||
fwereade_ | wrtp, oddly reminiscent of a nice bay in gozo | 08:28 |
wrtp | fwereade_: pity about the shitty fb photo resolution. you can see the snow shower that hit us if you look vertically above the wee house. | 08:28 |
wrtp | a good mixed day | 08:29 |
fwereade_ | wrtp, that ever-so-slight fuzziness? | 08:29 |
wrtp | fwereade_: xactly | 08:29 |
wrtp | fwereade_: sun and blizzards, what more could we ask for?! | 08:29 |
fwereade_ | wrtp, sounds pretty awesome to me :) | 08:30 |
TheMue | wrtp: wonderful photo. and did you brought a fine Talisker with you | 08:30 |
wrtp | TheMue: of course! | 08:30 |
TheMue | wrtp: (envy) ;) | 08:31 |
TheMue | wrtp: i had the hope that my highland park 30yo will be here before easter. but it's so rare that i have to wait until mid of may. (sigh) | 08:32 |
wrtp | fwereade_: here's the bike route we did that day, excepting the bit that google maps doesn't know about. we started from Acharacle and went anti-clockwise. http://g.co/maps/wup3q | 08:43 |
wrtp | i love the fact that the google van went down all the tiny little roads around there (not all the tracks though, sadly :-)) | 08:44 |
niemeyer | Good morning | 12:31 |
wrtp | niemeyer: yo! | 12:31 |
wrtp | niemeyer: hope you had a good Easter... | 12:31 |
niemeyer | wrtp: Heya! Welcome back | 12:33 |
niemeyer | wrtp: Yeah, pretty good stuff | 12:33 |
niemeyer | wrtp: Although I've just been notified that the blog has been hacked again.. :( | 12:34 |
niemeyer | It's time to drop wordpress.. | 12:34 |
wrtp | which blog? | 12:34 |
niemeyer | wrtp: blog.labix.org | 12:39 |
wrtp | niemeyer: oops. i'd better check mine. | 12:43 |
TheMue | niemeyer: morning | 12:43 |
niemeyer | It's time to drop wordpress.. | 12:43 |
niemeyer | TheMue: Heya! | 12:43 |
TheMue | aaaaaaargh! f*ck, watching the right node during tests definitely helps :D | 13:12 |
andrewsmedina | morning | 13:29 |
niemeyer | Lunch time.. biab | 15:10 |
=== asavu_ is now known as asavu | ||
hazmat | bcsaller1, it looks like the problems are the same bzr circular merge that was here before.. | 17:32 |
hazmat | bcsaller1, ignoring reitveld's diff.. the actual diff to trunk is borked | 17:33 |
bcsaller1 | hazmat: thats is not what I thought the issue was, but I'm looking at it again | 17:33 |
bcsaller1 | hazmat: my diff to trunk looked ok, what are you seeing? | 17:37 |
hazmat | bcsaller1, the lp diff | 17:38 |
hazmat | bcsaller1, diffing manually to trunk produces a sane result | 17:39 |
bcsaller1 | yeah, thats was I was seeing | 17:40 |
=== bcsaller1 is now known as bcsaller | ||
hazmat | hmm.. actually not.. | 17:41 |
hazmat | test_service diff is odd | 17:41 |
hazmat | bcsaller, UnsupportedSuborinateServiceRemoval | 17:42 |
hazmat | missing a 'd' | 17:42 |
bcsaller | ha | 17:42 |
hazmat | and the doc string for the same has a typo | 17:42 |
bcsaller | type once, expand everywhere :( | 17:42 |
hazmat | bcsaller, huh.. nevermind that actually is screwed on trunk re test_service.py | 17:46 |
bcsaller | I think there was a whitespace issue, ran reindent.py on it when I saw that | 17:47 |
bcsaller | not sure what happened though | 17:47 |
hazmat | bcsaller, looks like it was introduced in the merge of subordinate control | 17:49 |
bcsaller | well, that should fix it | 17:49 |
wrtp | /me is off for the night. | 18:20 |
wrtp | :-) | 18:20 |
wrtp | see y'all tomorrow | 18:20 |
hazmat | bcsaller, review in | 18:47 |
hazmat | wrtp, cheers | 18:47 |
bcsaller | hazmat: thank you | 18:47 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!