[08:19] <dholbach> good morning
[10:02] <davidcalle> dholbach: let's merge all relevant branches ot trunk today, what do you think?
[10:02] <davidcalle> to*
[10:08] <dholbach> yep, WFM
[10:23] <davidcalle> dholbach: which ones do you want to see in?
[10:24] <davidcalle> dholbach: inherit, post-deployment-fixes and mike's apidoc changes? Or is the tour ok to join the party?
[10:26] <dholbach> the tour yes, but not the tour.refactor branch
[10:26] <dholbach> I can check Mike's branch if you want
[10:26] <dholbach> so you don't have to do them all
[10:30] <davidcalle> dholbach thanks :)
[13:48] <mhall119> davidcalle: any progress from webops on the upgrade?
[13:55] <davidcalle> mhall119: nothing more than what's on the rt (that we are in position #12 on their todo)
[14:36] <dholbach> mhall119, for your current MP - what's a good way to test it?
[14:37] <dholbach> can you maybe add something to the description here: https://code.launchpad.net/~mhall119/developer-ubuntu-com/apidoc-frameworks-creation/+merge/287069?
[15:15] <mhall119> dholbach: sure
[15:20] <dholbach> thanks
[15:38] <mhall119> dholbach: added testing instructions as a comment on the MP, let me know if it's not clear
[15:40] <dholbach> thanks a bunch mhall119 - will start taking a look in a bit
[15:40] <dholbach> mhall119, so before merging the branch I run the apidocs importer once? is it just a matter of running the management command in a fresh install?
[15:41] <mhall119> dholbach: you can run the ./update_apidocs.sh script to import everything, of just copy/paste a few of the lines from it if you only want to import enough to test
[15:42] <mhall119> you'll need to setup the topic, language and version records through the django-cms admin first though
[15:43] <mhall119> I usually setup apps/qml/15.04.1/ and then import just the QtQML and QtQuick apis
[15:43] <mhall119> that's enough to test
[15:43] <dholbach> ok
[15:54] <dholbach> davidcalle, for the inherit MP, we need to update the pip cache
[15:54] <dholbach> do I just add the binary and bump the revno?
[15:54] <dholbach> mhall119, can we, at some stage, please start with a fresh pip cache branch?
[15:54] <dholbach> mhall119, davidcalle and I both thought it was a good idea - I don't recall you commenting on it though
[15:56] <mhall119> the mechanisms are supposed to ensure that our deployments only update their pip-cache when needed, I'm afraid that starting over fresh might cause it to miss out on new packages
[15:57] <mhall119> it's only a slight possibility though, so if the burden of the branch history on it is high it's worth doing
[15:57] <davidcalle> dholbach: sorry I've missed it, I can update the cache in a short moment
[15:57] <mhall119> maybe in the future we can look into making it a tarball on swift, rather than a bzr branch
[15:58] <dholbach> davidcalle, no worries and thanks a lot
[15:58] <dholbach> mhall119, davidcalle and I often bounce branches to each other for playing around or start a new checkout from scratch and downloading 223M every time is a bit much
[16:00] <dholbach> another option would be to advise in README.md to branch pip-cache to ../ and symlink it from there before doing anything else
[16:00] <mhall119> or bzr branch it from ../ instead of Launchpad
[16:01] <mhall119> or lightweight checkout
[16:04] <dholbach> yep, nice one
[16:11] <davidcalle> dholbach: cache update
[16:11] <davidcalle> d*
[16:11] <dholbach> fantastico!
[16:57] <dholbach> mhall119, in the example you mentioned earlier, should the version be sdk-15.04.1?
[16:58] <dholbach> yes, looks like it
[16:58] <dholbach> mhall119, also: udpate_apidocs.sh does not use @env
[16:58] <dholbach> so django_openid_auth has to be installed on the local machine too
[17:04] <dholbach> mhall119, what would be a valid version string for a new development version (instead of sdk-15.04.1)?
[17:05] <mhall119> dholbach: oh, you need to activate your virtualenv to run update_apidocs
[17:06] <mhall119> you can use sdk-15.04.3 for a new string
[17:06] <mhall119> really anything would be fine
[17:06] <mhall119> could be dholback-is-awesome
[17:06] <mhall119> or, you know, maybe spelled correctly
[17:07] <dholbach> I see
[17:12] <dholbach> mhall119, where does perms.api_docs.add_version come from?
[17:14] <mhall119> dholbach: it's auto-generated permissions for the Version model
[17:14] <dholbach> ok
[17:14] <mhall119> every model gets an add_<model> permission
[17:14] <dholbach> I see
[17:14] <dholbach> thanks a lot - approved the MP
[17:15] <dholbach> and with that... I'm going to call it a day - have a good one! :-)
[17:15] <mhall119> \o.