Hi,
Here is a patch that fixes function spacing (2 preceding empty lines) issues
of
the 1.3 line (r3340), except when a commented line precedes the function (like
at line 31 of 'maths_fns/ri.py').
Cheers !
Séb :)
Selon Sébastien Morin <sebastien.morin.1@xxxxxxxxx>, 11.07.2007:
> Oups...
>
> The file wasn't loaded onto the server when I pressed 'send'.
>
> Sorry for that. It seems I should finish my coffee before sending mails...
>
> Ciao !
>
>
> Séb :P
>
>
>
>
> Selon Sébastien Morin <sebastien.morin.1@xxxxxxxxx>, 11.07.2007:
>
> > Hi,
> >
> > Here is a patch for revision 3339 of line 1.3 concerning all indentation
> > issues
> > (without the tab issues inside the OpenDX strings.
> >
> > This small patch modifies solely 2 files
> > ('test_suite/system_tests/model_free.py' and 'float.py')
> >
> > Ciao !
> >
> >
> >
> > Séb
> >
> >
> >
> > Selon Edward d'Auvergne <edward.dauvergne@xxxxxxxxx>, 10.07.2007:
> >
> > > Hi,
> > >
> > > I've committed this 1.3 line patch to the repository (r3339). I
> > > specificially excluded the 'dx/isosurface_3D.py' file because these
> > > changes could have caused the OpenDX programs to fail (the text output
> > > with trailing whitespace was generated by OpenDX itself, and therefore
> > > removing it might be dangerous). If you could Seb, it would be best
> > > if the indentation fixes were placed into a patch for r3339 as
> > > 'patch__indentation_tab' modifies solely the 'dx/isosurface_3D.py'
> > > file. The indentation inside the strings embedded in this file should
> > > remain as they are because OpenDX may expect this indentation.
> > >
> > > Cheers,
> > >
> > > Edward
> > >
> > >
> > >
> > > On 7/10/07, Sébastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
> > > > Hi Ed !
> > > >
> > > > In fact, I thought about this but wasn't sure...
> > > >
> > > > Here is the patch without the modification to the code where it should
> > end
> > > in '\
> > > > ', thus without any modification to those files :
> > > >
> > > > maths_fns/mf.py
> > > > maths_fns/jw_mf.py
> > > > maths_fns/jw_mf_comps.py
> > > > maths_fns/chi2.py
> > > > minimise/levenberg_marquardt.py
> > > > minimise/line_search/test_functions.py
> > > >
> > > >
> > > > Ciao !
> > > >
> > > >
> > > > Séb
> > > >
> > > >
> > > >
> > > > Selon Edward d'Auvergne <edward.dauvergne@xxxxxxxxx>, 10.07.2007:
> > > >
> > > > > Sorry, I didn't realise to warn you that the trailing single space
in
> > > > > the equation lines which terminate in '\' are important. This
> > > > > character, if not followed by a space, will cause the newline to be
> > > > > removed from the docstring in the python help system. For example
if
> > > > > you type
> > > > >
> > > > > relax> from maths_fns import jw_mf
> > > > > relax> help(jw_mf.calc_S2f_S2s_ts_d2jw_dS2fdS2s)
> > > > >
> > > > > with the patch applied, you can see the issue - the middle line gets
> > > > > appended to the top line. A similar issue occurs in the OpenDX
input
> > > > > files that are created by relax. All these special single trailing
> > > > > whitespaces are important. I'm really sorry for not having realised
> > > > > earlier, it's been a long time since I worked on that code.
> > > > >
> > > > > Regards,
> > > > >
> > > > > Edward
> > > > >
> > > > >
> > > > >
> > > > > On 7/10/07, Sébastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
> > > > > > Hi,
> > > > > >
> > > > > > Here is a patch for trailing whitespaces in the code for the 1.3
> line
> > > > > (revision
> > > > > > 3338).
> > > > > >
> > > > > > This should fix all formating issues of this kind for the entire
> > > code...
> > > > > >
> > > > > > Ciao
> > > > > >
> > > > > >
> > > > > > Séb :)
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > > Selon Edward d'Auvergne <edward.dauvergne@xxxxxxxxx>, 09.07.2007:
> > > > > >
> > > > > > > Thanks. Please try to keep different types of changes separate
> > > > > > > though. All the changes so far are whitespace related so I can
> > > commit
> > > > > > > the patch as fixing whitespace formatting in the 1.3 line. If
> > there
> > > > > > > are other changes, these should go as separate commits into the
> > relax
> > > > > > > repository. That way I can decide if the whitespace commit will
> be
> > > > > > > back ported to the 1.2 line (which isn't really necessary) or if
> > > other
> > > > > > > changes in individual commits should be back ported (some
> probably
> > > > > > > will while others may not).
> > > > > > >
> > > > > > > Cheers,
> > > > > > >
> > > > > > > Edward
> > > > > > >
> > > > > > >
> > > > > > > On 7/9/07, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
> > > > > > > > Hi Ed !
> > > > > > > >
> > > > > > > > I will send a single large patch tomorrow when I have
corrected
> > > more
> > > > > > > code...
> > > > > > > >
> > > > > > > > Bye
> > > > > > > >
> > > > > > > >
> > > > > > > > Séb
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > Edward d'Auvergne wrote:
> > > > > > > > > Hi,
> > > > > > > > >
> > > > > > > > > These minor formatting changes do need to made to the
> > repository.
> > > > > > > > > Would you still have all the changes in your checked out
copy
> > > Séb?
> > > > > If
> > > > > > > > > you could send a single patch of all the changes, it will be
> > much
> > > > > > > > > easier for me to apply. That would be much appreciated.
> > > > > > > > >
> > > > > > > > > Thanks,
> > > > > > > > >
> > > > > > > > > Edward
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > On 7/9/07, Sébastien Morin <sebastien.morin.1@xxxxxxxxx>
> > wrote:
> > > > > > > > >> Hi all,
> > > > > > > > >>
> > > > > > > > >> Here are a few patches solving fomating issues in the 1.3
> line
> > > > > > > > >> (revision 3324).
> > > > > > > > >>
> > > > > > > > >> patch_sample_scripts_palmer ->
> > > > > sample_scripts/palmer.py
> > > > > > > > >>
> > > > > > > > >> patch_test_suite_runner ->
> > > > > > > > >> sample_scripts/relax_curve_diff.py
> > > > > > > > >>
> > > > > > > > >> patch_sample_scripts_relax_curve_diff ->
> > > sample_scripts/remap.py
> > > > > > > > >>
> > > > > > > > >> patch_test_suite_system_tests_jw_mapping ->
> > > > > test_suite/formatting.py
> > > > > > > > >>
> > > > > > > > >> patch_sample_scripts_remap ->
> > > test_suite/runner.py
> > > > > > > > >>
> > > > > > > > >> patch_test_suite_system_tests_main ->
> > > > > > > > >> test_suite/system_tests/jw_mapping.py
> > > > > > > > >>
> > > > > > > > >> patch_test_suite_formatting ->
> > > > > > > > >> test_suite/system_tests/main.py
> > > > > > > > >>
> > > > > > > > >> patch_test_suite_system_tests_model_free ->
> > > > > > > > >> test_suite/system_tests/model_free.py
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >> These are low importance changes but nevertheless the work
> > needs
> > > to
> > > > > > > > >> be done.
> > > > > > > > >>
> > > > > > > > >> Cheers.
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >> Séb :)
> > > > > > > > >> _______________________________________________
> > > > > > > > >> relax (http://nmr-relax.com)
> > > > > > > > >>
> > > > > > > > >> This is the relax-devel mailing list
> > > > > > > > >> relax-devel@xxxxxxx
> > > > > > > > >>
> > > > > > > > >> To unsubscribe from this list, get a password
> > > > > > > > >> reminder, or change your subscription options,
> > > > > > > > >> visit the list information page at
> > > > > > > > >> https://mail.gna.org/listinfo/relax-devel
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >
> > > > > > > >
> > > > > > > > --
> > > > > > > > ______________________________________
> > > > > > > > _______________________________________________
> > > > > > > > | |
> > > > > > > > || Sebastien Morin ||
> > > > > > > > ||| Etudiant au PhD en biochimie |||
> > > > > > > > |||| Laboratoire de resonance magnetique nucleaire ||||
> > > > > > > > ||||| Dr Stephane Gagne |||||
> > > > > > > > |||| CREFSIP (Universite Laval, Quebec, CANADA) ||||
> > > > > > > > ||| 1-418-656-2131 #4530 |||
> > > > > > > > || ||
> > > > > > > > |_______________________________________________|
> > > > > > > > ______________________________________
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > >
> > > > > >
> > > > > >
> > > > > > ------------------------
> > > > > > Sébastien Morin
> > > > > > Étudiant M.Sc. Biochimie
> > > > > > Laboratoire S. Gagné
> > > > > > 3252 Pav. Marchand (Université Laval)
> > > > > > Tél : (418) 656-2131 #4530
> > > > > > Fax : (418) 656-7176
> > > > > > e-mail : sebastien.morin.1@xxxxxxxxx
> > > > > >
> > > > >
> > > > >
> > > >
> > > >
> > > >
> > > > ------------------------
> > > > Sébastien Morin
> > > > Étudiant M.Sc. Biochimie
> > > > Laboratoire S. Gagné
> > > > 3252 Pav. Marchand (Université Laval)
> > > > Tél : (418) 656-2131 #4530
> > > > Fax : (418) 656-7176
> > > > e-mail : sebastien.morin.1@xxxxxxxxx
> > > >
> > >
> > >
> >
> >
> >
> > ------------------------
> > Sébastien Morin
> > Étudiant M.Sc. Biochimie
> > Laboratoire S. Gagné
> > 3252 Pav. Marchand (Université Laval)
> > Tél : (418) 656-2131 #4530
> > Fax : (418) 656-7176
> > e-mail : sebastien.morin.1@xxxxxxxxx
> >
> >
> > _______________________________________________
> > relax (http://nmr-relax.com)
> >
> > This is the relax-devel mailing list
> > relax-devel@xxxxxxx
> >
> > To unsubscribe from this list, get a password
> > reminder, or change your subscription options,
> > visit the list information page at
> > https://mail.gna.org/listinfo/relax-devel
> >
> >
>
>
>
> ------------------------
> Sébastien Morin
> Étudiant M.Sc. Biochimie
> Laboratoire S. Gagné
> 3252 Pav. Marchand (Université Laval)
> Tél : (418) 656-2131 #4530
> Fax : (418) 656-7176
> e-mail : sebastien.morin.1@xxxxxxxxx
------------------------
Sébastien Morin
Étudiant M.Sc. Biochimie
Laboratoire S. Gagné
3252 Pav. Marchand (Université Laval)
Tél : (418) 656-2131 #4530
Fax : (418) 656-7176
e-mail : sebastien.morin.1@xxxxxxxxx
Re: Formating issues in the 1.3 line