This is an automated email from the git hooks/post-receive script. yoh pushed a commit to annotated tag v0.1 in repository python-mne.
commit c3bad672a914250dd7e9bf7866a18fedd29bfc25 Author: Alexandre Gramfort <[email protected]> Date: Wed May 4 13:40:08 2011 -0400 running reindent on all files --- doc/source/conf.py | 2 +- doc/sphinxext/docscrape.py | 12 +++++------- doc/sphinxext/docscrape_sphinx.py | 1 - doc/sphinxext/ipython_console_highlighting.py | 4 ++-- doc/sphinxext/numpy_ext/numpydoc.py | 1 - doc/sphinxext/numpy_ext_old/docscrape.py | 2 -- doc/utils/extract_config_doc.py | 5 ++--- doc/utils/lut2sphinxtbl.py | 5 ++--- doc/utils/make_clean_config.py | 5 ++--- mne/fiff/write.py | 10 +++++----- mne/minimum_norm/tests/test_time_frequency.py | 1 - mne/tests/test_source_estimate.py | 2 -- mne/time_frequency/__init__.py | 1 - mne/time_frequency/tests/test_tfr.py | 1 - 14 files changed, 19 insertions(+), 33 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 56404d2..060f142 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -222,4 +222,4 @@ latex_logo = "_static/logo.png" latex_use_modindex = True -trim_doctests_flags = True \ No newline at end of file +trim_doctests_flags = True diff --git a/doc/sphinxext/docscrape.py b/doc/sphinxext/docscrape.py index d518756..a6d333e 100755 --- a/doc/sphinxext/docscrape.py +++ b/doc/sphinxext/docscrape.py @@ -185,7 +185,7 @@ class NumpyDocString(object): return params - + _name_rgx = re.compile(r"^\s*(:(?P<role>\w+):`(?P<name>[a-zA-Z0-9_.-]+)`|" r" (?P<name2>[a-zA-Z0-9_.-]+))\s*", re.X) def _parse_see_also(self, content): @@ -218,7 +218,7 @@ class NumpyDocString(object): current_func = None rest = [] - + for line in content: if not line.strip(): continue @@ -260,7 +260,7 @@ class NumpyDocString(object): if len(line) > 2: out[line[1]] = strip_each_in(line[2].split(',')) return out - + def _parse_summary(self): """Grab signature (if given) and summary""" if self._is_at_section(): @@ -277,7 +277,7 @@ class NumpyDocString(object): if not self._is_at_section(): self['Extended Summary'] = self._read_to_next_section() - + def _parse(self): self._doc.reset() self._parse_summary() @@ -442,7 +442,7 @@ class FunctionDoc(NumpyDocString): else: func = self._f return func, func_name - + def __str__(self): out = '' @@ -495,5 +495,3 @@ class ClassDoc(NumpyDocString): # out += '.. index::\n single: %s; %s\n\n' % (self._name, m) return out - - diff --git a/doc/sphinxext/docscrape_sphinx.py b/doc/sphinxext/docscrape_sphinx.py index a1de7c5..eda6c35 100755 --- a/doc/sphinxext/docscrape_sphinx.py +++ b/doc/sphinxext/docscrape_sphinx.py @@ -135,4 +135,3 @@ def get_doc_object(obj, what=None, doc=None): if doc is None: doc = pydoc.getdoc(obj) return SphinxDocString(doc) - diff --git a/doc/sphinxext/ipython_console_highlighting.py b/doc/sphinxext/ipython_console_highlighting.py index d018e17..7d024b5 100755 --- a/doc/sphinxext/ipython_console_highlighting.py +++ b/doc/sphinxext/ipython_console_highlighting.py @@ -11,7 +11,7 @@ import re # Third party from pygments.lexer import Lexer, do_insertions -from pygments.lexers.agile import (PythonConsoleLexer, PythonLexer, +from pygments.lexers.agile import (PythonConsoleLexer, PythonLexer, PythonTracebackLexer) from pygments.token import Comment, Generic @@ -47,7 +47,7 @@ class IPythonConsoleLexer(Lexer): - It assumes the default IPython prompts, not customized ones. """ - + name = 'IPython console session' aliases = ['ipython'] mimetypes = ['text/x-ipython-console'] diff --git a/doc/sphinxext/numpy_ext/numpydoc.py b/doc/sphinxext/numpy_ext/numpydoc.py index aa39005..630a432 100755 --- a/doc/sphinxext/numpy_ext/numpydoc.py +++ b/doc/sphinxext/numpy_ext/numpydoc.py @@ -161,4 +161,3 @@ def wrap_mangling_directive(base_directive, objtype): return base_directive.run(self) return directive - diff --git a/doc/sphinxext/numpy_ext_old/docscrape.py b/doc/sphinxext/numpy_ext_old/docscrape.py index a4b7c21..fb4b544 100755 --- a/doc/sphinxext/numpy_ext_old/docscrape.py +++ b/doc/sphinxext/numpy_ext_old/docscrape.py @@ -488,5 +488,3 @@ class ClassDoc(NumpyDocString): # out += '.. index::\n single: %s; %s\n\n' % (self._name, m) return out - - diff --git a/doc/utils/extract_config_doc.py b/doc/utils/extract_config_doc.py index b30f7d1..c101bcf 100755 --- a/doc/utils/extract_config_doc.py +++ b/doc/utils/extract_config_doc.py @@ -2,7 +2,7 @@ """ This script will extract the documentation from the full_configbase.py -module, reformat it somewhat, and write it as a reST document in +module, reformat it somewhat, and write it as a reST document in $PYFIFF/doc/source. """ @@ -24,7 +24,7 @@ write = False space = False def flip(value): - if value: + if value: return False else: return True @@ -71,4 +71,3 @@ for num, line in enumerate(confid): confid.close() docfid.close() - diff --git a/doc/utils/lut2sphinxtbl.py b/doc/utils/lut2sphinxtbl.py index 904a79e..02051ed 100755 --- a/doc/utils/lut2sphinxtbl.py +++ b/doc/utils/lut2sphinxtbl.py @@ -18,7 +18,7 @@ namelist = [] for i, arg in enumerate(sys.argv): if i > 2: namelist.append(arg) -atlasname = " ".join(namelist) +atlasname = " ".join(namelist) lutarr = np.genfromtxt(lutfile, str) lutarr = lutarr[:,:2] @@ -30,7 +30,7 @@ for row in lutarr: if len(row[1]) > maxname: maxname = len(row[1]) leftbar = max(maxid, 3) -rightbar = max(maxname, 20) +rightbar = max(maxname, 20) fid = open(spxfile, "w") @@ -63,4 +63,3 @@ for row in lutarr: fid.write("%d%s%s\n" % (id, space, name)) fid.write("%s %s\n\n" % (leftline, rightline)) - diff --git a/doc/utils/make_clean_config.py b/doc/utils/make_clean_config.py index a115b94..ce35036 100755 --- a/doc/utils/make_clean_config.py +++ b/doc/utils/make_clean_config.py @@ -6,7 +6,7 @@ fullfid = open(os.path.join(os.path.split(__file__)[0], os.path.pardir, os.path. "data", "configfiles", "full_configbase.py"), "r") cleanfid = open(os.path.join(os.path.split(__file__)[0], os.path.pardir, os.path.pardir, "data", "configfiles", "clean_configbase.py"), "w") - + write = True lastflip = None @@ -17,7 +17,7 @@ def flip(value): return True for num, line in enumerate(fullfid): - + if not line.startswith("#--"): if line.startswith("\"\"\"") and num > 15: write = flip(write) @@ -28,4 +28,3 @@ for num, line in enumerate(fullfid): fullfid.close() cleanfid.close() - diff --git a/mne/fiff/write.py b/mne/fiff/write.py index c7cf2d3..e50679b 100755 --- a/mne/fiff/write.py +++ b/mne/fiff/write.py @@ -171,11 +171,11 @@ def write_coord_trans(fid, trans): FIFFV_NEXT_SEQ = 0 #?typedef struct _fiffCoordTransRec { - # fiff_int_t from; /*!< Source coordinate system. */ - # fiff_int_t to; /*!< Destination coordinate system. */ - # fiff_float_t rot[3][3]; /*!< The forward transform (rotation part) */ - # fiff_float_t move[3]; /*!< The forward transform (translation part) */ - # fiff_float_t invrot[3][3]; /*!< The inverse transform (rotation part) */ + # fiff_int_t from; /*!< Source coordinate system. */ + # fiff_int_t to; /*!< Destination coordinate system. */ + # fiff_float_t rot[3][3]; /*!< The forward transform (rotation part) */ + # fiff_float_t move[3]; /*!< The forward transform (translation part) */ + # fiff_float_t invrot[3][3]; /*!< The inverse transform (rotation part) */ # fiff_float_t invmove[3]; /*!< The inverse transform (translation part) */ #} *fiffCoordTrans, fiffCoordTransRec; /*!< Coordinate transformation descriptor */ diff --git a/mne/minimum_norm/tests/test_time_frequency.py b/mne/minimum_norm/tests/test_time_frequency.py index e153129..f829ae7 100644 --- a/mne/minimum_norm/tests/test_time_frequency.py +++ b/mne/minimum_norm/tests/test_time_frequency.py @@ -51,4 +51,3 @@ def test_tfr_with_inverse_operator(): assert len(stcs) == len(bands.keys()) assert np.all(stc.data > 0) assert_array_almost_equal(stc.times, epochs.times) - diff --git a/mne/tests/test_source_estimate.py b/mne/tests/test_source_estimate.py index ad0c9e8..60cb087 100755 --- a/mne/tests/test_source_estimate.py +++ b/mne/tests/test_source_estimate.py @@ -50,5 +50,3 @@ def test_morph_data(): mean_from = stc_from.data.mean(axis=0) mean_to = stc_to.data.mean(axis=0) assert np.corrcoef(mean_to, mean_from).min() > 0.99 - - \ No newline at end of file diff --git a/mne/time_frequency/__init__.py b/mne/time_frequency/__init__.py index b2674f5..837f961 100755 --- a/mne/time_frequency/__init__.py +++ b/mne/time_frequency/__init__.py @@ -2,4 +2,3 @@ """ from .tfr import induced_power, single_trial_power - diff --git a/mne/time_frequency/tests/test_tfr.py b/mne/time_frequency/tests/test_tfr.py index d0c5594..ccc76a7 100755 --- a/mne/time_frequency/tests/test_tfr.py +++ b/mne/time_frequency/tests/test_tfr.py @@ -62,4 +62,3 @@ def test_time_frequency(): n_cycles=2) assert_array_almost_equal(np.mean(single_power), power) - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
