[Opengeoscience-developers] OpenGeoscience branch, next, updated. 4afffb0eab83710e4cfe130ad7eaf8e93c4290df

[Aashish Chaudhary]

On Wed, May 8, 2013 at 3:32 PM, Ben Burnett <benjam.arlyn at gmail.com> wrote:

> Hi Aashish,
>
> I wasn't aware we were doing 2 spaces on python as well. The standard
> seems to be 4, and it looks like a majority of the python code in our
> project is already 4 spaces, not just mine. It will be easier to convert
> the few 2-spaced files to 4 spaces rather than the other way around at this
> point, so I think we should switch to 4 spaces for python.
>

My only problem with 4 spaces is that the lines shift to right bit too much
and python does not like line wrapping. I would like our lines to go 80
column
if you think that having 4 spaces would not make our code to cross col 80
(+-2 would be ok) then I say lets do 4 spaces

>
> What do you think?
>
> Ben
>
>
> On Fri, May 3, 2013 at 8:03 PM, Aashish Chaudhary <
> aashish.chaudhary at kitware.com> wrote:
>
>> Ben,
>>
>> The code looks reasonable but you would have to walk me through the code
>> so that I completely understand it. Some minor things
>>
>> - Please use spacing (not tabs) of size 2 (for python and JS)
>> - Based on the feedback from Mansa/Keval combine variable into single
>> statement
>>
>> Thanks,
>>
>>
>>
>> On Wed, May 1, 2013 at 1:44 PM, Aashish Chaudhary <
>> aashish.chaudhary at kitware.com> wrote:
>>
>>> Great. Thanks for pushing it upstream. Looking forward to it.
>>>
>>> - Aashish
>>>
>>>
>>>
>>> On Wed, May 1, 2013 at 1:43 PM, Ben Burnett <benjam.arlyn at gmail.com>wrote:
>>>
>>>> sure, thanks
>>>>
>>>>
>>>> On Wed, May 1, 2013 at 1:43 PM, Aashish Chaudhary <
>>>> aashish.chaudhary at kitware.com> wrote:
>>>>
>>>>> Sure but probably it won't happen until Friday (as I will need some
>>>>> time to review it). Would that be OK?
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> On Wed, May 1, 2013 at 1:26 PM, Ben Burnett <benjam.arlyn at gmail.com>wrote:
>>>>>
>>>>>> Aashish,
>>>>>>
>>>>>> Branch services_modules_nodes should be ready to go into master. Can
>>>>>> you review and merge it?
>>>>>>
>>>>>> Thanks,
>>>>>> Ben
>>>>>>
>>>>>>
>>>>>> On Wed, May 1, 2013 at 1:20 PM, Ben Burnett <bburnett at poly.edu>wrote:
>>>>>>
>>>>>>> This is an automated email from the git hooks/post-receive script.
>>>>>>> It was
>>>>>>> generated because a ref change was pushed to the repository
>>>>>>> containing
>>>>>>> the project "OpenGeoscience".
>>>>>>>
>>>>>>> The branch, next has been updated
>>>>>>>        via  4afffb0eab83710e4cfe130ad7eaf8e93c4290df (commit)
>>>>>>>        via  5b0c250e44258cd62ff3b8f05ef1b9a6f7d6d655 (commit)
>>>>>>>        via  be8a8a2c5942cd42a50cd41834472fe21e5e3456 (commit)
>>>>>>>        via  d8355cb5b7a84026d7fbe1db121b700d1ed638d8 (commit)
>>>>>>>        via  27704500eeb7b214b200e48d3217e6ba2d67596b (commit)
>>>>>>>        via  f4c8fa87aa1e7b19bff96f7470f8a0c9cfbd1fd2 (commit)
>>>>>>>       from  96c9b158580bd5d9e9ff64af3a9a547ad839934b (commit)
>>>>>>>
>>>>>>> Those revisions listed above that are new to this repository have
>>>>>>> not appeared on any other notification email; so we list those
>>>>>>> revisions in full, below.
>>>>>>>
>>>>>>> - Log
>>>>>>> -----------------------------------------------------------------
>>>>>>>
>>>>>>> http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=4afffb0eab83710e4cfe130ad7eaf8e93c4290df
>>>>>>> commit 4afffb0eab83710e4cfe130ad7eaf8e93c4290df
>>>>>>> Merge: 96c9b15 5b0c250
>>>>>>> Author: Ben Burnett <bburnett at poly.edu>
>>>>>>> Date:   Wed May 1 13:19:32 2013 -0400
>>>>>>>
>>>>>>>     Merge branch 'services_modules_nodes' into next
>>>>>>>
>>>>>>>     Conflicts:
>>>>>>>         geoweb.py
>>>>>>>
>>>>>>>  geoweb.py            |   77
>>>>>>> +++++++++++++++++++++++++++++++++++++++++--------
>>>>>>>  services/__init__.py |   54 -----------------------------------
>>>>>>>  temp/testService.py  |    2 +
>>>>>>>  3 files changed, 66 insertions(+), 67 deletions(-)
>>>>>>>
>>>>>>>
>>>>>>> -----------------------------------------------------------------------
>>>>>>>
>>>>>>> Summary of changes:
>>>>>>>  geoweb.py            |   77
>>>>>>> +++++++++++++++++++++++++++++++++++++++++--------
>>>>>>>  services/__init__.py |   54 -----------------------------------
>>>>>>>  temp/testService.py  |    2 +
>>>>>>>  3 files changed, 66 insertions(+), 67 deletions(-)
>>>>>>>  delete mode 100644 services/__init__.py
>>>>>>>  create mode 100644 temp/testService.py
>>>>>>>
>>>>>>>
>>>>>>> hooks/post-receive
>>>>>>> --
>>>>>>> OpenGeoscience
>>>>>>> _______________________________________________
>>>>>>> Opengeoscience-developers mailing list
>>>>>>> Opengeoscience-developers at public.kitware.com
>>>>>>>
>>>>>>> http://public.kitware.com/cgi-bin/mailman/listinfo/opengeoscience-developers
>>>>>>>
>>>>>>
>>>>>>
>>>>>> _______________________________________________
>>>>>> Opengeoscience-developers mailing list
>>>>>> Opengeoscience-developers at public.kitware.com
>>>>>>
>>>>>> http://public.kitware.com/cgi-bin/mailman/listinfo/opengeoscience-developers
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> | Aashish Chaudhary
>>>>> | R&D Engineer
>>>>> | Kitware Inc.
>>>>> | www.kitware.com
>>>>>
>>>>
>>>>
>>>
>>>
>>> --
>>> | Aashish Chaudhary
>>> | R&D Engineer
>>> | Kitware Inc.
>>> | www.kitware.com
>>>
>>
>>
>>
>> --
>> | Aashish Chaudhary
>> | R&D Engineer
>> | Kitware Inc.
>> | www.kitware.com
>>
>
>


-- 
| Aashish Chaudhary
| R&D Engineer
| Kitware Inc.
| www.kitware.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/opengeoscience-developers/attachments/20130508/6f6ac45a/attachment.html>