| Time |
S |
Nick |
Message |
| 01:53 |
|
|
axfelix joined #dvn |
| 03:30 |
|
|
axfelix joined #dvn |
| 04:46 |
|
|
whatsoniqss joined #dvn |
| 14:53 |
|
|
jwhitney joined #dvn |
| 15:21 |
|
skay |
pdurbin: if you see rliebz pop in could you nudge him to make a pull request? he's making some changes to make the code more pythonic in style and I'd like to rebase my fork to that |
| 15:22 |
|
skay |
pdurbin: I posted to the mailing list and Josh replied, so nudging Josh is another option |
| 15:22 |
|
skay |
pdurbin: ideally I'd actually like to rebase my fork to master after he merges |
| 15:24 |
|
skay |
pdurbin: I want to wrap up the other work I was doing yesterday so I can jump back on this. ideally I want to have dvn_client in shape to work with pip install, not necessarily pypi -- pointing to a git repo is fine |
| 15:25 |
|
skay |
if that doesn't happen, I'll be okay, but I'd like to be able to do that so as not to have do do workarounds in my stuff to be able to include the client |
| 16:01 |
|
|
axfelix joined #dvn |
| 16:22 |
|
pdurbin |
skay: sorry, home with a sick kid today. we got some (cold) air and now we're back inside |
| 16:23 |
|
pdurbin |
I just read though this thread: [technical] code collaboration on dvn-python-client - Google Groups - https://groups.google.com/forum/#!topic/openscienceframework/qV7YfW2HbAg |
| 16:23 |
|
skay |
pdurbin: oh no :( hope kid is better soon |
| 16:23 |
|
pdurbin |
I'm soliciting opinions internally |
| 16:25 |
|
pdurbin |
skay: as you know, I'm fine with having a collaborator such as yourself manage that python repo. Someone who knows python better than we do |
| 16:26 |
|
skay |
pdurbin: I thought you didn't want me to be a committer, but were okay with the OSF folks being committers since you know them better |
| 16:26 |
|
skay |
I am happy to work with another python person who has commit access -- at the moment the OSF folks sound busy with other things though |
| 16:28 |
|
pdurbin |
everybody's busy :) |
| 16:29 |
|
skay |
even me! :) I wish I had more time to do everything |
| 16:29 |
|
pdurbin |
:) |
| 16:34 |
|
pdurbin |
skay: maybe I read the thread too quickly... are you volunteering to be in charge of the python client repo? to decide if pull requests should be merged? |
| 16:35 |
|
skay |
pdurbin: yes indeed! :) |
| 16:36 |
|
pdurbin |
awesome. that's just what we need |
| 16:36 |
|
skay |
pdurbin: I'd like some more collaborators so that I have some more help with reviewing, but I'm okay |
| 16:36 |
|
skay |
I'll kick my friends until they help |
| 16:37 |
|
skay |
I cringe everytime I merge something without any other eyeballs |
| 16:37 |
|
pdurbin |
yeah, me too |
| 16:37 |
|
skay |
but is just something that is going to happen with small open source projects, I guess. I'm learning |
| 16:37 |
|
pdurbin |
and there are no tests, right? or are there? |
| 16:38 |
|
skay |
there are, but they hit a live service, so I'm not sure they are good for an automated ci thing like jenkins or travis-ci |
| 16:38 |
|
pdurbin |
right. hmm |
| 16:38 |
|
skay |
I'm planning on setting up travis-ci but with some of the non-live tests... but experiment with service level tests to see how that goes |
| 16:38 |
|
skay |
travis allows connecting out to get things |
| 16:38 |
|
skay |
I bet there will be false failures though, depending |
| 16:39 |
|
skay |
at orbitz we had service level tests -- but we also had things that would deploy a stack for the jenkins jobs |
| 16:39 |
|
skay |
I would rather have something rather than nothing, and setting up stuff like that is not going to happen any time soon |
| 16:40 |
|
skay |
so even if it is just a checkstyle type of thing, I'm going to have that be the first test-like thing |
| 16:41 |
|
skay |
doing service tests against a mock service is one strategy, but I've found that we ended up spending more time that we liked maintaining the mock. it's a tradeoff |
| 16:41 |
|
skay |
I've been mulling over it in the back of my mind |
| 16:43 |
|
skay |
going a bit more afk now |
| 16:58 |
|
pdurbin |
yeah, needs more mulling |
| 19:29 |
|
|
posixeleni joined #dvn |
| 19:29 |
|
pdurbin |
skay: I just joined the OSF list. think you could send one more reply to that thread so I can reply via email? |
| 19:42 |
|
skay |
sure |
| 19:45 |
|
pdurbin |
skay: thanks |
| 19:45 |
|
skay |
pdurbin: you're welcome. just replied |
| 19:46 |
|
pdurbin |
yep. I see it. perfect |
| 19:46 |
|
* pdurbin |
thinks of what to say :) |
| 19:47 |
|
skay |
hey, if you have enough to say for an blog post for the osc blog that would be cool |
| 19:47 |
|
skay |
(I wanted to drop that in there) |
| 19:47 |
|
skay |
there is a related oscblog mailing list with crossover membership |
| 19:54 |
|
pdurbin |
javaeebot: lucky osc blog |
| 19:54 |
|
javaeebot |
pdurbin: http://blogs.osc-ib.com/ |
| 19:55 |
|
pdurbin |
don't think that's it |
| 19:55 |
|
pdurbin |
posixeleni: you're our blogger :) |
| 19:55 |
|
skay |
pdurbin: http://osc.centerforopenscience.org/ |
| 19:56 |
|
skay |
it's actually http://opensciencecollaboration.org/ but that redirects |
| 19:56 |
|
pdurbin |
wait, COS and OSC have the same logo? |
| 19:56 |
|
skay |
different colors |
| 19:56 |
|
posixeleni |
pdurbin: skay: what would the blog post be about? sorry came in late. |
| 19:58 |
|
pdurbin |
skay: but you're in cahoots with COS/OSC? |
| 19:58 |
|
skay |
can't brainstorm at the moment. but perhaps something about the dataverse network and open data / open science etc.? |
| 19:58 |
|
skay |
pdurbin: yeah, I help with the osc and know the cos folks |
| 19:58 |
|
pdurbin |
very good |
| 19:58 |
|
skay |
pdurbin: I haven't written a blog post (yet). |
| 19:59 |
|
skay |
If you like I can post int he osc mailing list to suggest approaching the dataverse group so that you don't feel awkward swooping in |
| 19:59 |
|
pdurbin |
another mailing list?!? ;) |
| 19:59 |
|
skay |
heh |
| 19:59 |
|
skay |
I filter them both in to the same label |
| 19:59 |
|
skay |
not huge activity |
| 19:59 |
|
skay |
so many mailing lists |
| 20:09 |
|
pdurbin |
skay: wait, you don't like this idea? "Sheila, we'll likely want to merge your work into Robert's fork, and you might want to pull Robert's repo as well." |
| 20:09 |
|
pdurbin |
skay: you said "I like the idea of pushing our improvements to the main repo and doing work off short-lived branches." |
| 20:11 |
|
skay |
pdurbin: let me explain. I like continuous integration and merging quickly |
| 20:11 |
|
posixeleni |
skay: sounds good to me! keep me posted |
| 20:11 |
|
skay |
so, ideally, I want Robert to make a pull request rather than spending a lot of long term effort changing his branch |
| 20:11 |
|
skay |
likewise with myself |
| 20:11 |
|
pdurbin |
well |
| 20:12 |
|
skay |
my preference would be for him to make a pull request to master (or we could have master development release branches) |
| 20:12 |
|
pdurbin |
skay: the two people who need to merge with each other successfully are you and robert, right? |
| 20:12 |
|
skay |
yes |
| 20:12 |
|
skay |
but we should both merge to master |
| 20:12 |
|
pdurbin |
on the upstream repo? |
| 20:12 |
|
skay |
yes |
| 20:12 |
|
pdurbin |
via a pull request |
| 20:12 |
|
skay |
yes |
| 20:13 |
|
skay |
or if we have commit, via a pull request off a branch in the same repo |
| 20:13 |
|
pdurbin |
skay: and you'll manage the pull requests. decide which to pull. resolve conflicts, etc. |
| 20:13 |
|
skay |
yes |
| 20:13 |
|
skay |
except it is considered polite for people to resolve their conflicts, but life is not perfect |
| 20:13 |
|
pdurbin |
heh. sure |
| 20:13 |
|
pdurbin |
one sec |
| 20:14 |
|
skay |
at work I would be very strict about that and reject a change (I mean, at orbitz) |
| 20:14 |
|
skay |
there is no way I can be as anal about the open source stuff as I was there |
| 20:14 |
|
skay |
everyone would kill me |
| 20:14 |
|
skay |
and the population is different |
| 20:14 |
|
skay |
so anyway, "merge early merge often" |
| 20:14 |
|
skay |
working master, always should work |
| 20:15 |
|
skay |
or, people sometimes have the concept of a master branch and development branch |
| 20:15 |
|
skay |
as recommended by people who recommend git-flow |
| 20:15 |
|
pdurbin |
skay: ok, I just gave you the same access as jeff and josh from COS and as peter who originally wrote the library |
| 20:15 |
|
* skay |
searches for commentary on merge early merge often, http://www.codinghorror.com/blog/2008/08/check-in-early-check-in-often.html |
| 20:16 |
|
skay |
yeah, I wanted to ask on their mailing list in order to see what type of branch/merge behavior they prefer |
| 20:16 |
|
skay |
I don't like to push my opinions on people |
| 20:16 |
|
skay |
for my own stuff, I will be a dictator and lay down the law |
| 20:16 |
|
skay |
but not for other's |
| 20:16 |
|
skay |
others' repos. something. augh I am a green grocer |
| 20:16 |
|
skay |
http://danielkummer.github.io/git-flow-cheatsheet/ |
| 20:17 |
|
skay |
btw, I have only used git seriously for about a year? almost a year? |
| 20:17 |
|
skay |
before that I was using a stream-based version control system called accurev. I still mentally think in that version control system |
| 20:17 |
|
skay |
anyway, I don't use git-flow for everything but I do like the development and master branch |
| 20:18 |
|
skay |
on my own stuff the default branch is develop. when there is something to go to production, it goes on master |
| 20:18 |
|
skay |
then we tag it |
| 20:18 |
|
pdurbin |
skay: you can run the repo however you'd like :) |
| 20:18 |
|
pdurbin |
skay: but you need to play nice with robert :) |
| 20:19 |
|
pdurbin |
skay: so your immediate goal is to get both his changes and your changes merged into master in the upstream repo |
| 20:19 |
|
pdurbin |
skay: at your convenience, of course :) |
| 20:20 |
|
skay |
pdurbin: yes, and then I might be switching context until early next week before I make changes |
| 20:21 |
|
skay |
obvious I am okay with immediately merging my change unless you see something objectionable. I need to review his changes first. I only skimmed them so far |
| 20:21 |
|
pdurbin |
skay: confused. you're going to try to get it all merged soon? |
| 20:21 |
|
skay |
yes |
| 20:22 |
|
skay |
pdurbin: do youw ant a heads up before I merge anything to master? |
| 20:22 |
|
pdurbin |
skay: cool. please cooridate with robert if there are conflicts. I hope there aren't any |
| 20:22 |
|
pdurbin |
skay: nah, I should get an email. but feel free to make noise about it :) |
| 20:23 |
|
pdurbin |
coordinate* |
| 20:23 |
|
skay |
k |
| 20:23 |
|
skay |
I'm going to go add the dataverse logo to our page now |
| 20:23 |
|
skay |
woot |
| 20:25 |
|
pdurbin |
:) |
| 20:44 |
|
pdurbin |
skay: ok, looks like my reply went through. And I cc'd the dataverse list: https://groups.google.com/d/msg/dataverse-community/XYPDmU1K12Y/jX5zPNQHZrYJ |
| 20:45 |
|
pdurbin |
skay: thanks again! :) |
| 20:49 |
|
skay |
:) |
| 21:58 |
|
|
rliebz joined #dvn |
| 22:04 |
|
rliebz |
pdurbin: Robert here. I saw you reached some sort of consensus, so I was wondering if there was anything you needed me to do. |
| 23:39 |
|
pdurbin |
shoot. missed him |
