You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David James <ja...@gmail.com> on 2005/08/03 19:53:44 UTC
Licensing on donated code in the Python bindings
The Trac folks have donated their Python version control abstraction
layer and test suite to the Subversion project under the New BSD
license! If we integrate this code into Subversion, we'll have a
working abstraction layer and test suite for our Python/SWIG bindings.
I'd like to start integrating the Trac abstraction layer with the
Python bindings. I'd like to do this in my
"python-bindings-improvements" branch. As soon as we have integrated
this code, we'll have a thorough set of tests which will make it
easier to evaluate whether the bindings are working. We'll also have
an easy to use and documented abstraction layer for our bindings,
written in pure Python.
In order to comply with the New BSD license, we'll need to add the
following disclaimer into the directory containing the new abstraction
layer and test suite. Would this be OK? This license only applies to
the code that the Trac team has donated to us. We'll still own the
full copyright on any code we write.
The New BSD license is a well-known open-source license, and is fully
compatible with all other open source licenses. In fact, it's less
restrictive than Subversion's own "Apache 1.1" license -- the only
requirement of the license is that we retain the copyright notices and
the disclaimers in the donated code.
I've attached a copy of the New BSD license below. It's direct from
http://www.opensource.org/licenses/bsd-license.php (with the names of
the copyright holders added in).
Copyright (C) 2005 Edgewall Software
Copyright (C) 2005 Christopher Lenz <cm...@gmx.de>
All rights reserved.
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Edgewall Software nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by David James <ja...@gmail.com>.
On 04 Aug 2005 22:07:12 -0500, kfogel@collab.net <kf...@collab.net> wrote:
> Okay -- just make sure Ben Reser is clear on what the two branches
> mean, and which one he should review, and we should be fine.
Okay :)
The "python-bindings-improvements-interim-for-review" branch will
contain the code which is ready to merge to trunk. The
"python-bindings-improvements" branch will contain the same code, plus
the new abstraction layer for the bindings.
Cheers,
David
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by kf...@collab.net.
David James <ja...@gmail.com> writes:
> Yes, this is exactly right.
>
> I've already got a few tweaks I'd like to make to "p-b-i-i-f-r", but I
> don't want to make them dependent on my "abstract bindings work". The
> two need to be independent, so that we can merge my bugfixes to trunk
> without merging the experimental abstract bindings.
>
> Is "python-memory-management" a good name? That describes what's on
> the branch -- the memory management code, plus any fixes that need to
> be made.
Okay -- just make sure Ben Reser is clear on what the two branches
mean, and which one he should review, and we should be fine.
Ben Collins-Sussman and I just had dinner with Daniel Berlin, btw, and
he said he'd take a look at it too, so that's two pairs of eyes on the
branch. Between breser and dberlin, you should be in good hands :-).
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by David James <ja...@gmail.com>.
On 04 Aug 2005 15:24:43 -0500, kfogel@collab.net <kf...@collab.net> wrote:
> Now I'm more confused :-). Let me try restating what I think the goal
> is, then you tell me if I'm on the right track.
>
> The p-b-i branch is currently in a good, mergeable state right now,
> and you don't want to interfere with that, because you know Ben Reser
> is about to review it. But you also don't want to stop further
> development. So, you want one branch for Ben to review, and another
> on which you can keep working without interruption.
Exactly.
> If this is the plan, let's use clear names to indicate it:
>
> 1. Copy p-b-i to p-b-i-interim-for-review
>
> 2. Continue working on p-b-i as before.
>
> 3. Supply Ben Reser with the exact commands he'll need to review
> p-b-i-interim-for-review, to save him time.
>
> 4. Any tweaks you make to p-b-i-i-f-r, make to p-b-i as well. If
> one absorbs any trunk changes or bugfixes, the other must absorb
> them as well, and vice versa, so that the difference between the
> two branches is always simply the further work done on the p-b-i
> branch.
>
> 5. If Ben wants to review p-b-i-i-f-r as well, he can, but it might
> be more efficient for him to just do p-b-i (or a subset thereof)
> and then we'll see where things stand.
Yes, this is exactly right.
I've already got a few tweaks I'd like to make to "p-b-i-i-f-r", but I
don't want to make them dependent on my "abstract bindings work". The
two need to be independent, so that we can merge my bugfixes to trunk
without merging the experimental abstract bindings.
Is "python-memory-management" a good name? That describes what's on
the branch -- the memory management code, plus any fixes that need to
be made.
Cheers,
David
>
> B-e-s-t,
> -K-a-r-l
>
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by kf...@collab.net.
David James <ja...@gmail.com> writes:
> > Hmm, I'm not sure I understand exactly what you're proposing -- could
> > you explain it in terms of the proposed branch and merge commands,
> > maybe, so there's no possible ambiguity?
>
> svn cp -r 15574 \
> http://svn.collab.net/repos/svn/branches/python-bindings-improvements \
> http://svn.collab.net/repos/svn/branches/python-memory-management
>
> This will mostly be a "tag", but I want to call it a branch so that
> I'll be able to fix bugs if necessary.
Now I'm more confused :-). Let me try restating what I think the goal
is, then you tell me if I'm on the right track.
The p-b-i branch is currently in a good, mergeable state right now,
and you don't want to interfere with that, because you know Ben Reser
is about to review it. But you also don't want to stop further
development. So, you want one branch for Ben to review, and another
on which you can keep working without interruption.
If this is the plan, let's use clear names to indicate it:
1. Copy p-b-i to p-b-i-interim-for-review
2. Continue working on p-b-i as before.
3. Supply Ben Reser with the exact commands he'll need to review
p-b-i-interim-for-review, to save him time.
4. Any tweaks you make to p-b-i-i-f-r, make to p-b-i as well. If
one absorbs any trunk changes or bugfixes, the other must absorb
them as well, and vice versa, so that the difference between the
two branches is always simply the further work done on the p-b-i
branch.
5. If Ben wants to review p-b-i-i-f-r as well, he can, but it might
be more efficient for him to just do p-b-i (or a subset thereof)
and then we'll see where things stand.
B-e-s-t,
-K-a-r-l
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by David James <ja...@gmail.com>.
On 04 Aug 2005 14:42:28 -0500, kfogel@collab.net <kf...@collab.net> wrote:
> David James <ja...@gmail.com> writes:
> > The code is currently in a very nice state -- I'd like to keep a
> > record of that, especially considering that Ben is reviewing it right
> > now. If we create a new branch for the current code (and call it
> > "python-memory-management") we'll have a stable base from which to
> > perform the merge back to trunk (making changes along the way, if
> > necessary).
> >
> > Does that seem like a good idea? Or am I planning ahead too much?
>
> Hmm, I'm not sure I understand exactly what you're proposing -- could
> you explain it in terms of the proposed branch and merge commands,
> maybe, so there's no possible ambiguity?
svn cp -r 15574 \
http://svn.collab.net/repos/svn/branches/python-bindings-improvements \
http://svn.collab.net/repos/svn/branches/python-memory-management
This will mostly be a "tag", but I want to call it a branch so that
I'll be able to fix bugs if necessary.
Cheers,
David
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by kf...@collab.net.
David James <ja...@gmail.com> writes:
> The code is currently in a very nice state -- I'd like to keep a
> record of that, especially considering that Ben is reviewing it right
> now. If we create a new branch for the current code (and call it
> "python-memory-management") we'll have a stable base from which to
> perform the merge back to trunk (making changes along the way, if
> necessary).
>
> Does that seem like a good idea? Or am I planning ahead too much?
Hmm, I'm not sure I understand exactly what you're proposing -- could
you explain it in terms of the proposed branch and merge commands,
maybe, so there's no possible ambiguity?
Thanks,
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by David James <ja...@gmail.com>.
On 04 Aug 2005 12:57:55 -0500, kfogel@collab.net <kf...@collab.net> wrote:
> David James <ja...@gmail.com> writes:
> > If you're OK with this, I'll start work on it. Should I create a new
> > branch for this purpose, or should I just keep working in
> > "python-bindings-improvements"?
>
> No need for a new branch, just do it in the existing one. (That is,
> no need to rebranch just because of license differences; on the other
> hand, if you would rebranch for *technical* reasons, then that's
> perfectly fine of course.)
The code is currently in a very nice state -- I'd like to keep a
record of that, especially considering that Ben is reviewing it right
now. If we create a new branch for the current code (and call it
"python-memory-management") we'll have a stable base from which to
perform the merge back to trunk (making changes along the way, if
necessary).
Does that seem like a good idea? Or am I planning ahead too much?
Cheers,
David
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by kf...@collab.net.
David James <ja...@gmail.com> writes:
> If you're OK with this, I'll start work on it. Should I create a new
> branch for this purpose, or should I just keep working in
> "python-bindings-improvements"?
No need for a new branch, just do it in the existing one. (That is,
no need to rebranch just because of license differences; on the other
hand, if you would rebranch for *technical* reasons, then that's
perfectly fine of course.)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by Brian Behlendorf <br...@collab.net>.
The license filename sounds fine, I'll leave it to the others to
comment on branch strategy.
Brian
On Thu, 4 Aug 2005, David James wrote:
> How do you think I should format the copyright and license notices? I
> can put the legal code in a file named "LICENSE_FOR_PYTHON_BINDINGS"
> under the Python bindings. The license will basically say:
>
> The Python bindings for Subversion are distributed under the following terms:
>
> 1. [The text of the Subversion license, with copyright statements]
> 2. [The text of the New BSD license, with copyright statements]
>
> Does that work? For an example of this technique, see the SWIG license:
> http://www.swig.org/copyright.html
>
> In each contributed file from Trac, I'll have three copyright
> statements (one for CollabNet, one for Edgewall, and one for
> Christopher Lenz), plus a reference to the
> "LICENSE_FOR_PYTHON_BINDINGS" file. Does that sound good?
>
> If you're OK with this, I'll start work on it. Should I create a new
> branch for this purpose, or should I just keep working in
> "python-bindings-improvements"?
>
> Thanks,
>
> David
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by David James <ja...@gmail.com>.
On 04 Aug 2005 11:20:03 -0500, kfogel@collab.net <kf...@collab.net> wrote:
> Brian Behlendorf <br...@collab.net> writes:
> > On Wed, 3 Aug 2005, David James wrote:
> > > In order to comply with the New BSD license, we'll need to add the
> > > following disclaimer into the directory containing the new abstraction
> > > layer and test suite. Would this be OK? This license only applies to
> > > the code that the Trac team has donated to us. We'll still own the
> > > full copyright on any code we write.
> >
> > Speaking for CollabNet, submissions under this license are perfectly fine.
>
> If Brian says it's okay by CollabNet, then go for it, David.
>
> (But thanks for asking first.)
Thanks, Brian and Karl!
How do you think I should format the copyright and license notices? I
can put the legal code in a file named "LICENSE_FOR_PYTHON_BINDINGS"
under the Python bindings. The license will basically say:
The Python bindings for Subversion are distributed under the following terms:
1. [The text of the Subversion license, with copyright statements]
2. [The text of the New BSD license, with copyright statements]
Does that work? For an example of this technique, see the SWIG license:
http://www.swig.org/copyright.html
In each contributed file from Trac, I'll have three copyright
statements (one for CollabNet, one for Edgewall, and one for
Christopher Lenz), plus a reference to the
"LICENSE_FOR_PYTHON_BINDINGS" file. Does that sound good?
If you're OK with this, I'll start work on it. Should I create a new
branch for this purpose, or should I just keep working in
"python-bindings-improvements"?
Thanks,
David
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by kf...@collab.net.
Brian Behlendorf <br...@collab.net> writes:
> On Wed, 3 Aug 2005, David James wrote:
> > In order to comply with the New BSD license, we'll need to add the
> > following disclaimer into the directory containing the new abstraction
> > layer and test suite. Would this be OK? This license only applies to
> > the code that the Trac team has donated to us. We'll still own the
> > full copyright on any code we write.
>
> Speaking for CollabNet, submissions under this license are perfectly fine.
If Brian says it's okay by CollabNet, then go for it, David.
(But thanks for asking first.)
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Licensing on donated code in the Python bindings
Posted by Brian Behlendorf <br...@collab.net>.
On Wed, 3 Aug 2005, David James wrote:
> In order to comply with the New BSD license, we'll need to add the
> following disclaimer into the directory containing the new abstraction
> layer and test suite. Would this be OK? This license only applies to
> the code that the Trac team has donated to us. We'll still own the
> full copyright on any code we write.
Speaking for CollabNet, submissions under this license are perfectly fine.
Brian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org