Fix tutorials #1036

duboism · 2015-01-30T17:44:28Z

I have started to correct some tutorials. Don't hesitate to suggest other improvements.

Also fixed some PEP8 errors

…cters in example, PEP8-ize examples, language.

satra · 2015-01-31T01:13:48Z

doc/devel/matlab_interface_devel.rst

+                          desc='Name of person to say hello to')
+
+
+    class HelloWorldOutputSpec(MatlabInputSpec):


perhaps this should just be TraitedSpec like example 1. does this also answer your question on neurostars?

I will try that ASAP (and it answers my question on neurostars).

Is it OK to put the python source code in a separate file (for example matlab_example2.py) and include it with literalinclude? AFAI can see, the ouput is the same. The main advantage is that we can use a python editor to ensure PEP8-ness and test the code. Moreover we could offer the option to download it as it is done in the smri_ants_build_template example.

that's sounds good. all of those are done using py files that get converted from python to rst.

OK. Therefore I will move the 2 examples here to files.

…files and correct output specification in example 2.

duboism · 2015-02-02T16:56:12Z

I have meet some problems related to sphinx. Could you have a look at this question?

…o fix_tutorials

…date it), mention that nodes need absolut file path correct typos and add download section.

coveralls · 2015-02-06T09:44:15Z

Coverage decreased (-0.02%) to 70.36% when pulling 717555e on duboism:fix_tutorials into 6601b00 on nipy:master.

coveralls · 2015-02-06T12:43:59Z

Coverage decreased (-0.02%) to 70.36% when pulling 54fefed on duboism:fix_tutorials into 6601b00 on nipy:master.

duboism · 2015-02-06T15:00:31Z

I have met other sphinx related errors. See the message here.

fix: documentation indentation and highlighting

coveralls · 2015-02-09T11:37:47Z

Coverage decreased (-0.02%) to 70.36% when pulling 868b248 on duboism:fix_tutorials into 6601b00 on nipy:master.

duboism · 2015-09-14T20:14:32Z

The rebase should be finished. I hope I haven't destroyed any other work in correcting the many conflicts. Don't hesitate to warn me in this case (but I can work on nipype only during my spare time).

chrisgorgo · 2015-09-14T20:21:56Z

.travis.yml

@@ -42,8 +42,9 @@ deploy:
  provider: pypi
  user: satra
  password:
-    secure: ZaN6Y4hfybPMi1rW3Qe03irCe/3GU4J4BJsjG+tClVN5Fjc3FCJaYU0k4wNd9q2kMjuRDv1efA9BN/5QasJS32oqs6wHvxzIWA18ucel4BBnAAkuviC1vqi/8Hk/DGB6e1gnmZ1Nv58zVLfn0MwlOKmsGDtvGQWc+HbaV2fS5NA=
+    secure: OCO0FXb4f+pH4Uw7zWCIRp3qOJ1t7rhky4K8MjNU8tyVCJgd6O/Bv8GJgceS0LktPodlAAjB8SxAhTORPAQZ1D/44PJYy3NQIisvej1zjLpaA9TEGfl6W7MqhDpRyMHW+cnSi/n84SAmdr+Z4vOxScDHdwr13EPmGyOIlHMAGnE=


was this an accidental change?

I don't remember having touched that file. So probably an accident. I will reverted this file.

this is not comparing properly with master - those changes are already in there. @duboism - could you please close this pull request and send a new one?

@satra Are you talking about the file .travis.yml or about all the modifications?

Hum, I have just cloned master in a separate directory and the .travis.yml file is identical the the one in this branch.

chrisgorgo · 2015-09-14T20:24:23Z

Thanks. I started going through it but I found many unresolved conflict markers in the code. I think something must've gone wrong when you were resolving merge conflicts.

duboism · 2015-09-14T20:35:00Z

Thanks for the review (I haven't found any tool to help during the rebase so I edited the files manually hence the leftovers and various glitches). I will fix those ASAP.

duboism · 2015-09-15T20:29:13Z

The leftovers you have pointed should be corrected now.

chrisgorgo · 2015-09-15T20:55:16Z

doc/users/tutorial_101.rst

+=======
+We want to connect the output produced by realignment to the input of
+smoothing. This is done as follows:
+>>>>>>> cb80e24fc2a68758defcb16c7ab70092aa35b693


unresolved conflict

djarecka · 2017-11-30T04:18:29Z

@duboism - it's a great pr, would you consider finishing it?

djarecka · 2017-12-13T17:06:32Z

@duboism - please let us know if you're planning to work on this PR, otherwise I'll try to review and finish/close.

duboism · 2017-12-13T22:12:26Z

@djarecka I have moved to a completely different job. I may find some time to finish this but it's not sure so feel free to work on the PR.

djarecka · 2017-12-14T01:03:17Z

@duboism - thank you for answering. We will be merging with the Nipype Tutorial, so I will review which changes will be useful in the new verion. Thanks!

satra · 2018-02-15T02:23:52Z

@djarecka - is this something that can be resolved before next release.

djarecka · 2018-02-15T19:05:47Z

I haven't reviewed this yet. Will try to it next week

Fix tutorials (continuation of #1036)

oesteban and others added 7 commits July 30, 2014 18:40

warping meshes

a1eb1e7

Edited CHANGES, added doctets, fixed errors

e3fdae7

fixed error in doctest

9769e1b

Added ETSConfig to avoid display errors

cf38e49

Also fixed some PEP8 errors

Updating mesh algorithms to vtk 6

e85d3a2

DOC Updated doc/devel/matlab_interface_devel.rst: remove invalid cara…

7aee50d

…cters in example, PEP8-ize examples, language.

Merge remote-tracking branch 'upstream/master' into fix_tutorials

c33285a

satra reviewed Jan 31, 2015
View reviewed changes

Mathieu Dubois and others added 4 commits February 2, 2015 15:53

DOC Fix typo.

c6d4d06

DOC Fix typo.

552d06d

DOC reworked devel/matlab_interface_devel.rst: move code to external …

ee6c25d

…files and correct output specification in example 2.

DOC add blank line in matlab examples

20a742c

Mathieu Dubois added 6 commits February 3, 2015 12:21

DOC fix literal block issues in nipype/interfaces/fsl/preprocess.py

cb62ced

Merge branch 'fix_tutorials' of https://github.com/duboism/nipype int…

32c4409

…o fix_tutorials

DOC updates in users/tutorial_101: move code in external file (and up…

dbf58c2

…date it), mention that nodes need absolut file path correct typos and add download section.

DOC correct download sections in devel/matlab_interface_devel.rst

343389c

WIP minimal modifications in users/interface_tutorial.rst

4af4773

Merge branch 'master' into fix_tutorials

717555e

Mathieu Dubois added 3 commits February 6, 2015 13:19

DOC correct indentation error in doc/index.rst

7639c66

DOC correct indentation error in doc/users/config.rst

d5d344b

DOC correct references in doc/devel/devel/cmd_interface_devel.rst

54fefed

nicholsn and others added 3 commits February 8, 2015 14:20

fix: documentation indentation and highlighting

8b89b73

Merge pull request #1 from nicholsn/docs/rsfmri-example

10b3cc4

fix: documentation indentation and highlighting

DOC minor fix in examples/rsfmri_vol_surface_preprocessing_nipy.py

868b248

DOC fix formatting in examples/fmri_ants_openfmri.py

6d81823

chrisgorgo reviewed Sep 14, 2015
View reviewed changes

DOC remove some leftovers.

8da068c

chrisgorgo reviewed Sep 15, 2015
View reviewed changes

djarecka self-assigned this Dec 14, 2017

djarecka mentioned this pull request Feb 22, 2018

Fix tutorials (continuation of #1036) #2459

Merged

effigies closed this Feb 22, 2018

effigies added a commit that referenced this pull request Feb 23, 2018

Merge pull request #2459 from djarecka/fix_tutorials

52efaa0

Fix tutorials (continuation of #1036)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix tutorials #1036

Fix tutorials #1036

duboism commented Jan 30, 2015

satra Jan 31, 2015

duboism Feb 1, 2015

duboism Feb 2, 2015

satra Feb 2, 2015

duboism Feb 2, 2015

duboism commented Feb 2, 2015

coveralls commented Feb 6, 2015

coveralls commented Feb 6, 2015

duboism commented Feb 6, 2015

coveralls commented Feb 9, 2015

duboism commented Sep 14, 2015

chrisgorgo Sep 14, 2015

duboism Sep 15, 2015

satra Sep 15, 2015

duboism Sep 15, 2015

duboism Sep 15, 2015

chrisgorgo commented Sep 14, 2015

duboism commented Sep 14, 2015

duboism commented Sep 15, 2015

chrisgorgo Sep 15, 2015

djarecka commented Nov 30, 2017

djarecka commented Dec 13, 2017

duboism commented Dec 13, 2017 •

edited

Loading

djarecka commented Dec 14, 2017

satra commented Feb 15, 2018

djarecka commented Feb 15, 2018

		desc='Name of person to say hello to')


		class HelloWorldOutputSpec(MatlabInputSpec):

Fix tutorials #1036

Fix tutorials #1036

Conversation

duboism commented Jan 30, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

duboism commented Feb 2, 2015

coveralls commented Feb 6, 2015

coveralls commented Feb 6, 2015

duboism commented Feb 6, 2015

coveralls commented Feb 9, 2015

duboism commented Sep 14, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chrisgorgo commented Sep 14, 2015

duboism commented Sep 14, 2015

duboism commented Sep 15, 2015

Choose a reason for hiding this comment

djarecka commented Nov 30, 2017

djarecka commented Dec 13, 2017

duboism commented Dec 13, 2017 • edited Loading

djarecka commented Dec 14, 2017

satra commented Feb 15, 2018

djarecka commented Feb 15, 2018

duboism commented Dec 13, 2017 •

edited

Loading