Screenshot instructions:
Windows
Mac
Red Hat Linux
Ubuntu
Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)
|
From: <astraw@us...> - 2009-09-06 20:13:46
|
Revision: 7660
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7660&view=rev
Author: astraw
Date: 2009-09-06 20:13:36 +0000 (Sun, 06 Sep 2009)
Log Message:
-----------
docs: describe how to run tests
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-09-06 20:13:06 UTC (rev 7659)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-09-06 20:13:36 UTC (rev 7660)
@@ -683,7 +683,15 @@
.. _nose: http://somethingaboutorange.com/mrl/projects/nose/
+Running the tests
+-----------------
+Running the tests is simple. Make sure you have nose installed and
+type from within Python::
+
+ import matplotlib
+ matplotlib.test()
+
Writing a simple test
---------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <astraw@us...> - 2009-02-04 22:22:06
|
Revision: 6877
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6877&view=rev
Author: astraw
Date: 2009-02-04 21:44:05 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
update docs to fetch less from svn when using git
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-02-04 21:43:08 UTC (rev 6876)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-02-04 21:44:05 UTC (rev 6877)
@@ -177,7 +177,7 @@
git svn init --branches=branches --trunk=trunk/matplotlib --tags=tags https://matplotlib.svn.sourceforge.net/svnroot/matplotlib
# Now just get the latest svn revisions from the SourceForge SVN repository
- git svn fetch -r 6300:HEAD
+ git svn fetch -r 6800:HEAD
.. _matplotlib github mirror: http://github.com/astraw/matplotlib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <astraw@us...> - 2009-02-04 22:22:19
|
Revision: 6878
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6878&view=rev
Author: astraw
Date: 2009-02-04 21:48:49 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
more git instructions
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-02-04 21:44:05 UTC (rev 6877)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-02-04 21:48:49 UTC (rev 6878)
@@ -224,6 +224,14 @@
git checkout whizbang-branch
git rebase master
+If you get the dreaded "Unable to determine upstream SVN information
+from working tree history" error when running "git svn rebase", try
+creating a new git branch based on subversion trunk and cherry pick
+your patches onto that::
+
+ git checkout -b work remotes/trunk # create a new "work" branch
+ git cherry-pick <commit> # where <commit> will get applied to new branch
+
Working on a maintenance branch from git
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mdboom@us...> - 2009-07-31 13:46:40
|
Revision: 7321
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7321&view=rev
Author: mdboom
Date: 2009-07-31 13:46:28 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
Update coding guide for 0.99 version
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-07-31 13:46:28 UTC (rev 7320)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-07-31 13:46:28 UTC (rev 7321)
@@ -27,12 +27,12 @@
Branch checkouts, eg the maintenance branch::
svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
- v0_91_maint mpl91 --username=youruser --password=yourpass
+ v0_99_maint mpl99 --username=youruser --password=yourpass
-The current release of the trunk is in the 0.98.5 maintenance branch::
+The current release of the trunk is in the 0.99.x maintenance branch::
svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
- v0_98_5_maint mpl98.5 --username=youruser --password=yourpass
+ v0_99_maint mpl99 --username=youruser --password=yourpass
Committing changes
@@ -96,7 +96,7 @@
svnmerge.py merge -S BRANCHNAME
Where BRANCHNAME is the name of the branch to merge *from*,
- e.g. v0_98_5_maint.
+ e.g. v0_99_maint.
If you wish to merge only specific revisions (in an unusual
situation), do::
@@ -130,17 +130,17 @@
with this.
* Creating a new branch from the trunk (if the release version is
- 0.98.5 at revision 6573)::
+ 0.99 at revision 6573)::
> svn copy \
- https://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib@... \
- https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint \
- -m "Creating maintenance branch for 0.98.5"
+ https://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib@... \
+ https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint \
+ -m "Creating maintenance branch for 0.99"
* You can add a new branch for the trunk to "track" using
"svnmerge.py init", e.g., from a working copy of the trunk::
- > svnmerge.py init https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint
+ > svnmerge.py init https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
property 'svnmerge-integrated' set on '.'
After doing a "svn commit" on this, this merge tracking is available
@@ -150,7 +150,7 @@
* Tracking can later be removed with the "svnmerge.py uninit" command,
e.g.::
- > svnmerge.py -S v0_9_5_maint uninit
+ > svnmerge.py -S v0_99_maint uninit
.. _using-git:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jdh2358@us...> - 2009-08-05 17:36:48
|
Revision: 7391
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7391&view=rev
Author: jdh2358
Date: 2009-08-05 17:36:27 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
updated devel doc with sample_data instructions
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:21:09 UTC (rev 7390)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:36:27 UTC (rev 7391)
@@ -563,6 +563,45 @@
.. _license-discussion:
+
+Writing examples
+================
+
+We have hundreds of examples in subdirectories of
+file:`matplotlib/examples` in the trunk, and these are automatically
+generated when the website it built to show up both in the `examples
+<http://matplotlib.sourceforge.net/examples/index.html>`_ and `gallery
+<http://matplotlib.sourceforge.net/gallery.html>`_ sections of the
+website. Many people find these examples from the website, and do not
+have ready access to the file:`examples` directory in which they
+reside. Thus any example data that is required for the example should
+be provided through the sample_data svn directory, which can then be
+accessed using :func:`matplotlib.cbook.get_sample_data`. First get a
+copy of the repository and svn add your data::
+
+ svn co http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
+ cp ~/path/to/mydata.dat sample_data/
+ cd sample_data
+ svn add mydata.dat
+ svn commit -m 'added my data'
+
+and then in your example code you can load it into a file handle with::
+
+ import matplotlib.cbook as cbook
+ fh = cbook.get_sample_data('mydata.dat')
+
+The file will be fetched from the svn repo using urllib and updated
+when the revision number changes.
+
+
+If you prefer just to get the full path to the file instead of an file
+object::
+
+ import matplotlib.cbook as cbook
+ datafile = cbook.get_sample_data('mydata.dat', asfileobj=False)
+ print 'datafile', datafile
+
+
Licenses
========
@@ -630,3 +669,4 @@
extensions for scientific computing: ipython, numpy, scipy, the
enthought tool suite and python itself are all distributed under BSD
compatible licenses.
+>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <astraw@us...> - 2009-09-06 20:13:46
|
Revision: 7660
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7660&view=rev
Author: astraw
Date: 2009-09-06 20:13:36 +0000 (Sun, 06 Sep 2009)
Log Message:
-----------
docs: describe how to run tests
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-09-06 20:13:06 UTC (rev 7659)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-09-06 20:13:36 UTC (rev 7660)
@@ -683,7 +683,15 @@
.. _nose: http://somethingaboutorange.com/mrl/projects/nose/
+Running the tests
+-----------------
+Running the tests is simple. Make sure you have nose installed and
+type from within Python::
+
+ import matplotlib
+ matplotlib.test()
+
Writing a simple test
---------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <astraw@us...> - 2009-10-06 15:01:30
|
Revision: 7851
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7851&view=rev
Author: astraw
Date: 2009-10-06 15:01:19 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
docs: update git instructions for re-built git/svn mirror
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-10-06 14:08:30 UTC (rev 7850)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-10-06 15:01:19 UTC (rev 7851)
@@ -169,16 +169,19 @@
repository. To make a local clone of it in the directory ``mpl.git``,
enter the following commands::
- # This will create your copy in the mpl.git directory
- git clone git://github.com/astraw/matplotlib.git mpl.git
+
+ # Download the entire git repository into "mpl.git", name the source repository "svn".
+ git clone --origin svn git@...:astraw/matplotlib.git mpl.git
+
+ # Change into the newly created git repository.
cd mpl.git
- git config --add remote.origin.fetch +refs/remotes/*:refs/remotes/*
- git fetch
- git svn init --branches=branches --trunk=trunk/matplotlib --tags=tags https://matplotlib.svn.sourceforge.net/svnroot/matplotlib
- # Now just get the latest svn revisions from the SourceForge SVN repository
- git svn fetch -r 6800:HEAD
+ # Setup the subversion mirroring.
+ git svn init --trunk=trunk/matplotlib --prefix=svn/ https://matplotlib.svn.sourceforge.net/svnroot/matplotlib
+ # Tell git svn to analyze the subversion history
+ git svn rebase -l
+
.. _matplotlib github mirror: http://github.com/astraw/matplotlib
To install from this cloned repository, use the commands in the
@@ -193,9 +196,9 @@
The following is a suggested workflow for git/git-svn.
Start with a virgin tree in sync with the svn trunk on the git branch
-"master"::
+"trunk"::
- git checkout master
+ git checkout trunk
git svn rebase
To create a new, local branch called "whizbang-branch"::
@@ -209,73 +212,26 @@
git commit -m "modified a bunch of files"
# repeat this as necessary
-Now, go back to the master branch and append the history of your branch
-to the master branch, which will end up as the svn trunk::
+Now, go back to the trunk branch and append the history of your branch
+to the git trunk branch, which will end up as the svn trunk::
- git checkout master
+ git checkout trunk
git svn rebase # Ensure we have most recent svn
- git rebase whizbang-branch # Append whizbang changes to master branch
+ git rebase whizbang-branch # Append whizbang changes to trunk branch
git svn dcommit -n # Check that this will apply to svn
git svn dcommit # Actually apply to svn
Finally, you may want to continue working on your whizbang-branch, so
-rebase it to the new master::
+rebase it to the new trunk::
git checkout whizbang-branch
- git rebase master
+ git rebase trunk
-If you get the dreaded "Unable to determine upstream SVN information
-from working tree history" error when running "git svn rebase", try
-creating a new git branch based on subversion trunk and cherry pick
-your patches onto that::
-
- git checkout -b work remotes/trunk # create a new "work" branch
- git cherry-pick <commit> # where <commit> will get applied to new branch
-
Working on a maintenance branch from git
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The matplotlib maintenance branches are also available through git.
-(Note that the ``git svn init`` line in the instructions above was
-updated to make this possible. If you created your git mirror without
-a ``--branches`` option, you will need to perform all of the steps
-again in a new directory).
+The matplotlib maintenance branches are not available through git.
-You can see which branches are available with::
-
- git branch -a
-
-To switch your working copy to the 0.98.5 maintenance branch::
-
- git checkout v0_98_5_maint
-
-Then you probably want to (as above) create a new local branch based
-on that branch::
-
- git checkout -b whizbang-branch
-
-When you ``git svn dcommit`` from a maintenance branch, it will commit
-to that branch, not to the trunk.
-
-While it should theoretically be possible to perform merges from a git
-maintenance branch to a git trunk and then commit those changes back
-to the SVN trunk, I have yet to find the magic incantation to make
-that work. However, svnmerge as described `above <svn-merge>`_ can be
-used and in fact works quite well.
-
-A note about git write access
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The matplotlib developers need to figure out if there should be write
-access to the git repository. This implies using the personal URL
-(``git@...:astraw/matplotlib.git``) rather than the public URL
-(``git://github.com/astraw/matplotlib.git``) for the
-repository. However, doing so may make life complicated in the sense
-that then there are two writeable matplotlib repositories, which must
-be synced to prevent divergence. This is probably not an
-insurmountable problem, but it is a problem that the developers should
-reach a consensus about. Watch this space...
-
.. _style-guide:
Style guide
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <astraw@us...> - 2009-11-12 22:17:41
|
Revision: 7957
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7957&view=rev
Author: astraw
Date: 2009-11-12 22:17:24 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
docs: update git guide
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-11-12 20:53:36 UTC (rev 7956)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-11-12 22:17:24 UTC (rev 7957)
@@ -166,15 +166,14 @@
~~~~~~~~~~~~~~~~~~~~~~
There is an experimental `matplotlib github mirror`_ of the subversion
-repository. To make a local clone of it in the directory ``mpl.git``,
+repository. To make a local clone of it in the directory ``matplotlib``,
enter the following commands::
+ # Download the entire git repository into "matplotlib", name the source repository "svn".
+ git clone --origin svn git@...:astraw/matplotlib.git
- # Download the entire git repository into "mpl.git", name the source repository "svn".
- git clone --origin svn git@...:astraw/matplotlib.git mpl.git
-
# Change into the newly created git repository.
- cd mpl.git
+ cd matplotlib
# Setup the subversion mirroring.
git svn init --trunk=trunk/matplotlib --prefix=svn/ https://matplotlib.svn.sourceforge.net/svnroot/matplotlib
@@ -187,12 +186,16 @@
To install from this cloned repository, use the commands in the
:ref:`svn installation <install-svn>` section::
- > cd mpl.git
+ > cd matplotlib
> python setup.py install
-Using git
-~~~~~~~~~
+Note that it is not possible to interact with the matplotlib
+maintenance branches through git due to different representations of
+source code repositories in svnmerge and git.
+An example git workflow
+~~~~~~~~~~~~~~~~~~~~~~~
+
The following is a suggested workflow for git/git-svn.
Start with a virgin tree in sync with the svn trunk on the git branch
@@ -227,11 +230,64 @@
git checkout whizbang-branch
git rebase trunk
-Working on a maintenance branch from git
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How was this git mirror set up?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The matplotlib maintenance branches are not available through git.
+These are notes for those interested in mirroring a subversion
+repository on github. I pieced this together by lots of
+trial-and-error.
+Step 1: Create a local mirror of the svn repository
+
+::
+
+ rsync -avzP rsync://matplotlib.svn.sourceforge.net/svn/matplotlib/ matplotlib-svn-rsync/
+
+Step 2: Import the svn history into a new git repository
+
+::
+
+ #!/bin/bash
+ set -e
+
+ TARGET=mpl.git.fixed
+ GIT=/home/astraw/git/bin/git
+ TRUNKBRANCH=trunk
+ SVNBRANCHPREFIX="svn/"
+
+ rm -rf $TARGET
+ mkdir $TARGET
+ cd $TARGET
+
+ $GIT init
+ $GIT svn init --rewrite-root=https://matplotlib.svn.sourceforge.net/svnroot/matplotlib \
+ --trunk=trunk/matplotlib --prefix=$SVNBRANCHPREFIX file:///mnt/workdisk/tmp/matplotlib-svn-rsync
+ $GIT svn fetch
+
+ # now, make master branch track ${SVNBRANCHPREFIX}trunk
+ $GIT checkout master -b tmp
+ $GIT branch -d master
+ $GIT checkout ${SVNBRANCHPREFIX}trunk -b $TRUNKBRANCH
+ $GIT branch -D tmp
+ $GIT svn rebase -l
+
+Step 3: Upload the git repository to github
+
+::
+
+ #!/bin/bash
+ set -e
+
+ TARGET=mpl.git.fixed
+ GIT=/home/astraw/git/bin/git
+ TRUNKBRANCH=trunk
+ SVNBRANCHPREFIX="svn/"
+
+ cd $TARGET
+
+ $GIT remote add github git@...:astraw/matplotlib.git
+ git push github $TRUNKBRANCH:master
+
.. _style-guide:
Style guide
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <efiring@us...> - 2010-04-26 18:49:54
|
Revision: 8270
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8270&view=rev
Author: efiring
Date: 2010-04-26 18:49:47 +0000 (Mon, 26 Apr 2010)
Log Message:
-----------
coding_guide: add instructions for running a single test (from Mike D.)
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2010-04-23 18:34:32 UTC (rev 8269)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2010-04-26 18:49:47 UTC (rev 8270)
@@ -637,6 +637,13 @@
import matplotlib
matplotlib.test()
+To run a single test from the command line, you can provide
+a dot-separated path to the module and function, eg.
+(this is assuming the test is installed)::
+
+ nosetests matplotlib.tests.test_simplification:test_clipping
+
+
Writing a simple test
---------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <efiring@us...> - 2010-06-13 21:31:52
|
Revision: 8425
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8425&view=rev
Author: efiring
Date: 2010-06-13 21:31:46 +0000 (Sun, 13 Jun 2010)
Log Message:
-----------
[2924597] coding_guide.rst: refer to memleak_hawaii3.py
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2010-06-13 21:04:14 UTC (rev 8424)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2010-06-13 21:31:46 UTC (rev 8425)
@@ -57,7 +57,7 @@
* Can you add a test to :file:`unit/nose_tests.py` to test your changes?
* If you have altered extension code, do you pass
- :file:`unit/memleak_hawaii.py`?
+ :file:`unit/memleak_hawaii3.py`?
* if you have added new files or directories, or reorganized existing
ones, are the new files included in the match patterns in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|