testtools

Merge lp:~lifeless/testtools/meta into lp:~testtools-committers/testtools/trunk

  1. meta
  2. Merge into trunk
Proposed by Robert Collins
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lifeless/testtools/meta
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 53 lines (+20/-5)
3 files modified
HACKING (+16/-4)
LICENSE (+1/-1)
NEWS (+3/-0)
To merge this branch: bzr merge lp:~lifeless/testtools/meta
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+15479@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

As discussed

Revision history for this message
Jonathan Lange (jml) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2009-11-30 03:03:27 +0000
3+++ HACKING 2009-12-01 10:10:58 +0000
4@@ -17,10 +17,22 @@
5 Copyright assignment
6 --------------------
7
8-Currently all code in testtools is copyright Jonathan M. Lange. For the sake
9-of licensing simplicity, copyright of contributed code needs to be assigned to
10-Jonathan M. Lange otherwise it cannot be accepted. Please include an
11-appropriate statement of copyright assignment with contributions.
12+Part of testtools raison d'etre is to provide Python with improvements to the
13+testing code it ships. For that reason we require all contributions (that are
14+non-trivial) to meet one of the following rules:
15+ - be inapplicable for inclusion in Python.
16+ - be able to be included in Python without further contact with the
17+ contributor.
18+ - be copyright assigned to Jonathan M. Lange.
19+Please pick one of these and specify it when contributing code to testtools.
20+
21+
22+Licensing
23+---------
24+
25+All code that is not copyright assigned to Jonathan M. Lange (see Copyright
26+Assignment above) needs to be licensed under the MIT license that testtools
27+ uses, so that testtools can ship it.
28
29
30 Testing
31
32=== modified file 'LICENSE'
33--- LICENSE 2008-06-01 05:42:47 +0000
34+++ LICENSE 2009-12-01 10:10:58 +0000
35@@ -1,4 +1,4 @@
36-Copyright (c) 2008 Jonathan M. Lange <jml@mumak.net>
37+Copyright (c) 2008 Jonathan M. Lange <jml@mumak.net> and the testtools authors.
38
39 Permission is hereby granted, free of charge, to any person obtaining a copy
40 of this software and associated documentation files (the "Software"), to deal
41
42=== modified file 'NEWS'
43--- NEWS 2009-11-30 10:53:04 +0000
44+++ NEWS 2009-12-01 10:10:58 +0000
45@@ -22,6 +22,9 @@
46 * TestCase no longer breaks if a TestSkipped exception is raised with no
47 parameters.
48
49+* Testtools now accepts contributions without copyright assignment under some
50+ circumstances. See HACKING for details.
51+
52 * TracebackContent now sets utf8 as the charset encoding, rather than not
53 setting one and encoding with the default encoder.
54

Subscribers

People subscribed via source and target branches