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
=== modified file 'HACKING'
--- HACKING 2009-11-30 03:03:27 +0000
+++ HACKING 2009-12-01 10:10:58 +0000
@@ -17,10 +17,22 @@
17Copyright assignment17Copyright assignment
18--------------------18--------------------
1919
20Currently all code in testtools is copyright Jonathan M. Lange. For the sake20Part of testtools raison d'etre is to provide Python with improvements to the
21of licensing simplicity, copyright of contributed code needs to be assigned to21testing code it ships. For that reason we require all contributions (that are
22Jonathan M. Lange otherwise it cannot be accepted. Please include an22non-trivial) to meet one of the following rules:
23appropriate statement of copyright assignment with contributions.23 - be inapplicable for inclusion in Python.
24 - be able to be included in Python without further contact with the
25 contributor.
26 - be copyright assigned to Jonathan M. Lange.
27Please pick one of these and specify it when contributing code to testtools.
28
29
30Licensing
31---------
32
33All code that is not copyright assigned to Jonathan M. Lange (see Copyright
34Assignment above) needs to be licensed under the MIT license that testtools
35 uses, so that testtools can ship it.
2436
2537
26Testing38Testing
2739
=== modified file 'LICENSE'
--- LICENSE 2008-06-01 05:42:47 +0000
+++ LICENSE 2009-12-01 10:10:58 +0000
@@ -1,4 +1,4 @@
1Copyright (c) 2008 Jonathan M. Lange <jml@mumak.net>1Copyright (c) 2008 Jonathan M. Lange <jml@mumak.net> and the testtools authors.
22
3Permission is hereby granted, free of charge, to any person obtaining a copy3Permission is hereby granted, free of charge, to any person obtaining a copy
4of this software and associated documentation files (the "Software"), to deal4of this software and associated documentation files (the "Software"), to deal
55
=== modified file 'NEWS'
--- NEWS 2009-11-30 10:53:04 +0000
+++ NEWS 2009-12-01 10:10:58 +0000
@@ -22,6 +22,9 @@
22* TestCase no longer breaks if a TestSkipped exception is raised with no22* TestCase no longer breaks if a TestSkipped exception is raised with no
23 parameters.23 parameters.
2424
25* Testtools now accepts contributions without copyright assignment under some
26 circumstances. See HACKING for details.
27
25* TracebackContent now sets utf8 as the charset encoding, rather than not28* TracebackContent now sets utf8 as the charset encoding, rather than not
26 setting one and encoding with the default encoder.29 setting one and encoding with the default encoder.
2730

Subscribers

People subscribed via source and target branches