Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Updated some of the documentation information. #1818

Closed
wants to merge 2 commits into
from

Conversation

Projects
None yet
3 participants
Member

pelson commented Mar 11, 2013

Note: some of the random changes here were due to the doctest failures, which I have now fixed.

@pelson pelson and 1 other commented on an outdated diff Mar 11, 2013

@@ -41,7 +41,7 @@
# General substitutions.
project = 'Matplotlib'
-copyright = '2013 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team'
+copyright = '2002 - 2013 Michael Droettboom and the matplotlib development team'
@pelson

pelson Mar 11, 2013

Member

I thought this was simpler. I don't mind if you want me to revert this.

@mdboom

mdboom Mar 11, 2013

Owner

Yeah -- I think we'll need to revert this. Some of the authors in that list depend on their name being there for reasons of tenure/job performance, etc.

@pelson

pelson Mar 12, 2013

Member

Ah ok. It wasn't meant as a slight to @efiring or @ddale - I'd be happy to revert.

@pelson pelson commented on the diff Mar 11, 2013

doc/devel/documenting_mpl.rst
@@ -351,7 +351,7 @@ An example save command to generate a movie looks like this
ani.save('double_pendulum.mp4', fps=15)
-Contact John Hunter for the login password to upload youtube videos of
+Contact Michael Droettboom for the login password to upload youtube videos of
@pelson

pelson Mar 11, 2013

Member

@mdboom - I'm hopeful you have this... if not, we might have to looking to get the password reset by Google. On this subject, are there any other developers with this information, or indeed the necessary admin information such as website passwords, github admin, sourceforge access?

@mdboom

mdboom Mar 11, 2013

Owner

I have Sourceforge, Github, website (which is also github) by virtue of being a team member, but not by John ever handing me his credentials. I don't have the Google account, though -- I'll see if I can pursue that with Google.

@mdboom mdboom and 1 other commented on an outdated diff Mar 11, 2013

doc/users/license.rst
@@ -17,18 +17,18 @@ licencing choice, see :ref:`license-discussion`.
License agreement for matplotlib |version|
==============================================
-1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
+1. This LICENSE AGREEMENT is between Michael Droettboom ("MDB"), and the
@mdboom

mdboom Mar 11, 2013

Owner

Maybe MGD, since that's my true initials? (Gregory)

@pelson

pelson Mar 12, 2013

Member

Sure thing - I couldn't find your middle name anywhere 😄 .

@mdboom mdboom and 1 other commented on an outdated diff Mar 11, 2013

doc/users/license.rst
@@ -55,8 +55,8 @@ THE POSSIBILITY THEREOF.
breach of its terms and conditions.
7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between JDH and
-Licensee. This License Agreement does not grant permission to use JDH
+relationship of agency, partnership, or joint venture between MDB and
+Licensee. This License Agreement does not grant permission to use MDB
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
@mdboom

mdboom Mar 11, 2013

Owner

IANAL -- I'll probably want to consult one for this change. Contributors contributed on the basis of John, not I, so I don't know if usurping is the right thing. There are also some other options and discussions going on behind the scenes about how best to move this forward.

@pelson

pelson Mar 12, 2013

Member

Understandable. Do you have access to legal advice? I'm sure we could get some help from the PSF on this (@VanL?) if we asked. I could also get some advice from our legal department if you like, but I suspect UK law is subtly different.

Member

pelson commented Mar 12, 2013

Mike - there is no direct rush on this pull request. I do believe we need to sure-up the legal position in our license agreement - perhaps we could put a loose target of getting this sorted by the end of SciPy'13? I'd be more than happy to help in any way I can. Lets re-open when we have a stance on the licensing info.

@pelson pelson closed this Mar 12, 2013

@pelson pelson reopened this Mar 12, 2013

@pelson pelson closed this Mar 12, 2013

@pelson pelson reopened this Mar 12, 2013

Member

pelson commented Mar 12, 2013

Sorry for the noise. I wanted to update the PR and it has to be open to trigger a commit change.

@pelson pelson closed this Mar 12, 2013

@pelson pelson reopened this Mar 12, 2013

@pelson pelson closed this Apr 12, 2013

Member

pelson commented Apr 12, 2013

@mdboom - any updates on the legal front? Is this something we want to have sorted out by v1.3?

Owner

mdboom commented Apr 12, 2013

Still waiting to hear...

Owner

mdboom commented Jun 19, 2013

Ok -- I have a determination on this. We should say 2000 - 2012 that the license is with John Hunter, and 2012 - 2013 present, with "The Matplotlib Team".

I also don't think we can remove the copyright on backend_wxagg.py, but we can give that a range of years, and then put 2012 - 2013 The Matplotlib Team.

I won't have any time to clean this up today, but should have some time later in the week, if you don't get to it first @pelson. In light of the nosetest plugin issue (see Fernando Perez's note on the mailing list), we should be able to get this and the fix for that into a 1.3.0rc4.

@mdboom mdboom reopened this Jun 19, 2013

Member

dmcdougall commented Jul 1, 2013

Ping.

Owner

mdboom commented Jul 1, 2013

Thanks for the ping. I've milestoned this as blocker so we can hopefully get this out for 1.3.0. We should announce on all channels that we're doing this, too.

@mdboom mdboom referenced this pull request Jul 2, 2013

Merged

Update copyright model #2195

Owner

mdboom commented Jul 2, 2013

Closing in favor of #2195.

@mdboom mdboom closed this Jul 2, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment