@@ -23,7 +23,7 @@ in mind.
2323* Can you pass :file: `examples/tests/backend_driver.py `? This is our
2424 poor man's unit test.
2525
26- * Can you add a test to :file: `unit/nose_tests.py ` to test your changes?
26+ * Can you add a test to :file: `lib/matplotlib/tests ` to test your changes?
2727
2828* If you have altered extension code, do you pass
2929 :file: `unit/memleak_hawaii3.py `?
@@ -33,7 +33,7 @@ in mind.
3333 :file: `MANIFEST.in `. This file determines what goes into the source
3434 distribution of the mpl build.
3535
36- * Keep the maintenance branches and trunk in sync where it makes sense.
36+ * Keep the maintenance branches and master in sync where it makes sense.
3737
3838Style guide
3939===========
@@ -101,8 +101,8 @@ To detect and fix these and other whitespace errors (see below),
101101use `reindent.py
102102<http://svn.python.org/projects/doctools/trunk/utils/reindent.py> `_ as
103103a command-line script. Unless you are sure your editor always
104- does the right thing, please use reindent.py before checking changes into
105- svn .
104+ does the right thing, please use reindent.py before committing your
105+ changes in git .
106106
107107Keep docstrings _ uniformly indented as in the example below, with
108108nothing to the left of the triple quotes. The
@@ -116,7 +116,7 @@ It may be preferable to use a temporary variable to replace a single
116116long line with two shorter and more readable lines.
117117
118118Please do not commit lines with trailing white space, as it causes
119- noise in svn diffs. Tell your editor to strip whitespace from line
119+ noise in git diffs. Tell your editor to strip whitespace from line
120120ends when saving a file. If you are an emacs user, the following in
121121your ``.emacs `` will cause emacs to strip trailing white space upon
122122saving for python, C and C++:
@@ -324,43 +324,32 @@ Writing examples
324324================
325325
326326We have hundreds of examples in subdirectories of
327- file:`matplotlib/examples ` in the trunk , and these are automatically
328- generated when the website it built to show up both in the `examples
327+ file:`matplotlib/examples `, and these are automatically
328+ generated when the website is built to show up both in the `examples
329329<http://matplotlib.sourceforge.net/examples/index.html> `_ and `gallery
330330<http://matplotlib.sourceforge.net/gallery.html> `_ sections of the
331331website. Many people find these examples from the website, and do not
332332have ready access to the file:`examples ` directory in which they
333333reside. Thus any example data that is required for the example should
334- be provided through the sample_data svn directory, which can then be
335- accessed using :func: `matplotlib.cbook.get_sample_data `. First get a
336- copy of the repository and svn add your data::
337-
338- svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
339- cp ~/path/to/mydata.dat sample_data/
340- cd sample_data
341- svn add mydata.dat
342- svn commit -m 'added my data'
343-
344- and then in your example code you can load it into a file handle with::
334+ be added to the `sample_data
335+ <https://github.com/matplotlib/sample_data> `_ git repository.
336+ Then in your example code you can load it into a file handle with::
345337
346338 import matplotlib.cbook as cbook
347339 fh = cbook.get_sample_data('mydata.dat')
348340
349- The file will be fetched from the svn repo using urllib and updated
341+ The file will be fetched from the git repo using urllib and updated
350342when the revision number changes.
351343
352344
353- If you prefer just to get the full path to the file instead of an file
345+ If you prefer just to get the full path to the file instead of a file
354346object::
355347
356348 import matplotlib.cbook as cbook
357349 datafile = cbook.get_sample_data('mydata.dat', asfileobj=False)
358350 print 'datafile', datafile
359351
360352
361-
362-
363-
364353Testing
365354=======
366355
0 commit comments