Merge lp:~dholbach/launchpad/coc-1.1 into lp:launchpad/db-devel

[Curtis Hovey]

[Curtis Hovey (sinzui)]

I am resubmitting this proposal because it must be merged into db-devel, not devel

[Curtis Hovey (sinzui)]

Hi Daniel.

This branch looks good to land after a couple of changes.

We want to revert line 147 of the diff because it is testing the old CoC, not the current one. We also need to replace the signed CoC that we are testing with the 1.1 version signed by Sample Person--this is hard. I had learn how we did it the first time, and you should not need to struggle with this. You can apply the patch at http://pastebin.ubuntu.com/332568/ to fix the test and the test data.

After you have applied and pushed the changes. I will approve it to land. PQM reopens 4 days. I can land this branch at that time. Your work will be visible on staging.launchpad.net next week, and will be released on 2009-12-17

review: Needs Fixing (code)

[Daniel Holbach (dholbach)]

Thanks a lot for the review and the fix to it. Those two were clearly "thinko"s. :-)

Great work!

[Daniel Holbach (dholbach)]

Hum... on a second look: should we instead of changing lib/lp/registry/stories/gpg-coc/reformatted_101_coc.asc not add lib/lp/registry/stories/gpg-coc/reformatted_11_coc.asc or something?

[Curtis Hovey (sinzui)]

I see the merge did not work as I expected. In my branch I renamed 101 to 11. Your branch only has the modifications. The test will fail because it is looking for reformatted_11_coc.asc. You can fix this using
    bzr mv lib/lp/registry/stories/gpg-coc/reformatted_101_coc.asc lib/lp/registry/stories/gpg-coc/reformatted_11_coc.asc

[Daniel Holbach (dholbach)]

I hope it's all good now.

[Curtis Hovey (sinzui)]

Thanks Daniel.

I will land this when PQM opens at the end of the week.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2009-09-10 10:27:20 +0000
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2009-12-02 15:33:16 +0000
@@ -94,8 +94,8 @@
 
 An ICodeOfConduct
 
-    >>> canonical_url(cocset['1.0'])
-    u'http://launchpad.dev/codeofconduct/1.0'
+    >>> canonical_url(cocset['1.1'])
+    u'http://launchpad.dev/codeofconduct/1.1'
 
 
 == Distributions, distroseriess and so on ==

=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2009-11-20 15:02:39 +0000
+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2009-12-02 15:33:16 +0000
@@ -96,8 +96,8 @@
 
 
 >>> check("/codeofconduct")
->>> check("/codeofconduct/1.0")
->>> check("/codeofconduct/1.0/+download")
+>>> check("/codeofconduct/1.1")
+>>> check("/codeofconduct/1.1/+download")
 
 >>> check("/projectgroups", auth=True)
 >>> check("/projectgroups/+all", auth=True)

=== added file 'lib/lp/registry/codesofconduct/1.1.txt'
--- lib/lp/registry/codesofconduct/1.1.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/codesofconduct/1.1.txt	2009-12-02 15:33:16 +0000
@@ -0,0 +1,82 @@
+= Ubuntu Code of Conduct v1.1 =
+
+This Code of Conduct covers our behaviour as members of the Ubuntu
+Community, in any forum, mailing list, wiki, web site, IRC channel,
+install-fest, public meeting or private correspondence.  Ubuntu
+governance bodies are ultimately accountable to the Ubuntu Community
+Council and will arbitrate in any dispute over the conduct of a member
+of the community.
+
+      '''Be considerate.''' Our work will be used by other people, and
+      we in turn will depend on the work of others. Any decision we take
+      will affect users and colleagues, and we should take those
+      consequences into account when making decisions.  Ubuntu has
+      millions of users and thousands of contributors. Even if it's not
+      obvious at the time, our contributions to Ubuntu will impact the
+      work of others.  For example, changes to code, infrastructure,
+      policy, documentation, and translations during a release may
+      negatively impact others' work.
+
+      '''Be respectful.''' The Ubuntu community and its members treat
+      one another with respect. Everyone can make a valuable
+      contribution to Ubuntu. We may not always agree, but disagreement
+      is no excuse for poor behaviour and poor manners. We might all
+      experience some frustration now and then, but we cannot allow that
+      frustration to turn into a personal attack. It's important to
+      remember that a community where people feel uncomfortable or
+      threatened is not a productive one. We expect members of the
+      Ubuntu community to be respectful when dealing with other
+      contributors as well as with people outside the Ubuntu project and
+      with users of Ubuntu.
+
+      '''Be collaborative.''' Collaboration is central to Ubuntu and to
+      the larger free software community.  This collaboration involves
+      individuals working with others in teams within Ubuntu, teams
+      working with each other within Ubuntu, and individuals and teams
+      within Ubuntu working with other projects outside. This
+      collaboration reduces redundancy, and improves the quality of our
+      work. Internally and externally, we should always be open to
+      collaboration. Wherever possible, we should work closely with
+      upstream projects and others in the free software community to
+      coordinate our technical, advocacy, documentation, and other work.
+      Our work should be done transparently and we should involve as
+      many interested parties as early as possible.  If we decide to
+      take a different approach than others, we will let them know early,
+      document our work and inform others regularly of our progress.
+
+      '''When we disagree, we consult others.''' Disagreements, both
+      social and technical, happen all the time and the Ubuntu
+      community is no exception. It is important that we resolve
+      disagreements and differing views constructively and with the help
+      of the community and community processes. We have the Technical
+      Board, the Community Council, and a series of other governance
+      bodies which help to decide the right course for Ubuntu. There are
+      also several Project Teams and Team Leaders, who may be able to
+      help us figure out the best direction for Ubuntu. When our goals
+      differ dramatically, we encourage the creation of alternative sets of
+      packages, or derivative distributions, using the Ubuntu Package
+      Management framework, so that the community can test new ideas and
+      contribute to the discussion.
+
+      '''When we are unsure, we ask for help.''' Nobody knows
+      everything, and nobody is expected to be perfect in the Ubuntu
+      community. Asking questions avoids many problems down the road,
+      and so questions are encouraged. Those who are asked questions should
+      be responsive and helpful. However, when asking a question, care must
+      be taken to do so in an appropriate forum.
+
+      '''Step down considerately.''' Members of every project come and
+      go and Ubuntu is no different. When somebody leaves or disengages
+      from the project, in whole or in part, we ask that they do so in a
+      way that minimises disruption to the project. This means they
+      should tell people they are leaving and take the proper steps to
+      ensure that others can pick up where they left off.
+
+We pride ourselves on building a productive, happy and agile community
+that can welcome new ideas in a complex field, and foster collaboration
+between groups with very different needs, interests and goals. We hold
+our leaders to an even higher standard, in the Leadership Code of
+Conduct, and arrange the governance of the community to ensure that
+issues can be raised with leaders who are engaged, interested and
+competent to help resolve them.
+

=== modified file 'lib/lp/registry/model/codeofconduct.py'
--- lib/lp/registry/model/codeofconduct.py	2009-07-17 18:46:25 +0000
+++ lib/lp/registry/model/codeofconduct.py	2009-12-02 15:33:16 +0000
@@ -47,7 +47,7 @@
 
     path = 'lib/lp/registry/codesofconduct/'
     prefix = 'Ubuntu Code of Conduct - '
-    currentrelease = '1.0.1'
+    currentrelease = '1.1'
     # Set the datereleased to the date that 1.0 CoC was released,
     # preserving everyone's Ubuntu Code of Conduct signatory status.
     # https://launchpad.net/products/launchpad/+bug/48995

=== modified file 'lib/lp/registry/stories/gpg-coc/02-signcoc.txt'
--- lib/lp/registry/stories/gpg-coc/02-signcoc.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/registry/stories/gpg-coc/02-signcoc.txt	2009-12-02 15:33:16 +0000
@@ -34,7 +34,7 @@
 Sample Person tries unsuccessfully to register a truncated code of conduct.
 
     >>> truncated_coc = read_file('truncated_coc.asc')
-    >>> browser.open('http://launchpad.dev/codeofconduct/1.0.1/+sign')
+    >>> browser.open('http://launchpad.dev/codeofconduct/1.1/+sign')
     >>> browser.getControl('Signed Code').value = truncated_coc
     >>> browser.getControl('Continue').click()
     >>> print_errors(browser.contents)
@@ -59,11 +59,11 @@
     >>> browser.open('http://launchpad.dev/codeofconduct/1.0/+sign')
     >>> browser.getLink('the current version').click()
     >>> print browser.url
-    http://launchpad.dev/codeofconduct/1.0.1
+    http://launchpad.dev/codeofconduct/1.1
 
     >>> browser.getLink('Sign it').click()
     >>> print browser.url
-    http://launchpad.dev/codeofconduct/1.0.1/+sign
+    http://launchpad.dev/codeofconduct/1.1/+sign
 
 
 Code of Conduct registration
@@ -73,7 +73,7 @@
 has leading spaces removed.  This succeeds because the words the same and
 appear in the same order.
 
-    >>> reformatted_coc = read_file('reformatted_101_coc.asc')
+    >>> reformatted_coc = read_file('reformatted_11_coc.asc')
     >>> browser.getControl('Signed Code').value = reformatted_coc
     >>> browser.getControl('Continue').click()
     >>> print browser.url

=== modified file 'lib/lp/registry/stories/gpg-coc/99-coc-presentation.txt'
--- lib/lp/registry/stories/gpg-coc/99-coc-presentation.txt	2009-08-18 17:25:41 +0000
+++ lib/lp/registry/stories/gpg-coc/99-coc-presentation.txt	2009-12-02 15:33:16 +0000
@@ -36,11 +36,11 @@
   >>> browser.open('http://localhost:9000/codeofconduct')
   >>> browser.getLink('current version').click()
 
-  >>> 'Ubuntu Code of Conduct - 1.0.1' in browser.contents
+  >>> 'Ubuntu Code of Conduct - 1.1' in browser.contents
   True
 
   >>> browser.getLink('Sign it').url
-  'http://localhost:9000/codeofconduct/1.0.1/+sign'
+  'http://localhost:9000/codeofconduct/1.1/+sign'
 
   >>> browser.getLink('Download this version').url
-  'http://localhost:9000/codeofconduct/1.0.1/+download'
+  'http://localhost:9000/codeofconduct/1.1/+download'

=== renamed file 'lib/lp/registry/stories/gpg-coc/reformatted_101_coc.asc' => 'lib/lp/registry/stories/gpg-coc/reformatted_11_coc.asc'
--- lib/lp/registry/stories/gpg-coc/reformatted_101_coc.asc	2006-05-25 21:18:24 +0000
+++ lib/lp/registry/stories/gpg-coc/reformatted_11_coc.asc	2009-12-02 15:33:16 +0000
@@ -1,89 +1,92 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-= Ubuntu Code of Conduct =
+= Ubuntu Code of Conduct v1.1 =
 
-This Code of Conduct covers your behaviour as a member of the Ubuntu
+This Code of Conduct covers our behaviour as members of the Ubuntu
 Community, in any forum, mailing list, wiki, web site, IRC channel,
-install-fest, public meeting or private correspondence. The Ubuntu
-Community Council will arbitrate in any dispute over the conduct of a
-member of the community.
-
-'''Be considerate.''' Your work will be used by other people,
-and you in turn will depend on the work of others. Any decision
-you take will affect users and colleagues, and we expect you to
-take those consequences into account when making decisions. For
-example, when we are in a feature freeze, please don't upload
-dramatically new versions of critical system software, as other
-people will be testing the frozen system and will not be
-expecting big changes.
-
-'''Be respectful.''' The Ubuntu community and its members treat
-one another with respect. Everyone can make a valuable
-contribution to Ubuntu. We may not always agree, but
-disagreement is no excuse for poor behaviour and poor
-manners. We might all experience some frustration now and then,
-but we cannot allow that frustration to turn into a personal
-attack. It's important to remember that a community where people
-feel uncomfortable or threatened is not a productive one. We
-expect members of the Ubuntu community to be respectful when
-dealing with other contributors as well as with people outside
-the Ubuntu project and with users of Ubuntu.
-
-'''Be collaborative.''' Ubuntu and Free Software are about
-collaboration and working together. Collaboration reduces
-redundancy of work done in the Free Software world, and improves
-the quality of the software produced. You should aim to
-collaborate with other Ubuntu maintainers, as well as with the
-upstream community that is interested in the work you do. Your
-work should be done transparently and patches from Ubuntu should
-be given back to the community when they are made, not just when
-the distribution releases. If you wish to work on new code for
-existing upstream projects, at least keep those projects
-informed of your ideas and progress. It may not be possible to
-get consensus from upstream or even from your colleagues about
-the correct implementation of an idea, so don't feel obliged to
-have that agreement before you begin, but at least keep the
-outside world informed of your work, and publish your work in a
-way that allows outsiders to test, discuss and contribute to
-your efforts.
-
-'''When you disagree,''' consult others. Disagreements, both
-political and technical, happen all the time and the Ubuntu
-community is no exception. The important goal is not to avoid
-disagreements or differing views but to resolve them
-constructively. You should turn to the community and to the
-community process to seek advice and to resolve
-disagreements. We have the Technical Board and the Community
-Council, both of which will help to decide the right course for
-Ubuntu. There are also several Project Teams and Team Leaders,
-who may be able to help you figure out which direction will be
-most acceptable. If you really want to go a different way, then
-we encourage you to make a derivative distribution or
-alternative set of packages available using the Ubuntu Package
-Management framework, so that the community can try out your
-changes and ideas for itself and contribute to the discussion.
-
-'''When you are unsure,''' ask for help. Nobody knows
-everything, and nobody is expected to be perfect in the Ubuntu
-community (except of course the SABDFL). Asking questions avoids
-many problems down the road, and so questions are
-encouraged. Those who are asked should be responsive and
-helpful. However, when asking a question, care must be taken to
-do so in an appropriate forum. Off-topic questions, such as
-requests for help on a development mailing list, detract from
-productive discussion.
-
-'''Step down considerately.''' Developers on every project come
-and go and Ubuntu is no different. When you leave or disengage
-from the project, in whole or in part, we ask that you do so in
-a way that minimises disruption to the project. This means you
-should tell people you are leaving and take the proper steps to
-ensure that others can pick up where you leave off.
+install-fest, public meeting or private correspondence.  Ubuntu
+governance bodies are ultimately accountable to the Ubuntu Community
+Council and will arbitrate in any dispute over the conduct of a member
+of the community.
+
+      '''Be considerate.''' Our work will be used by other people, and
+      we in turn will depend on the work of others. Any decision we take
+      will affect users and colleagues, and we should take those
+      consequences into account when making decisions.  Ubuntu has
+      millions of users and thousands of contributors. Even if it's not
+      obvious at the time, our contributions to Ubuntu will impact the
+      work of others.  For example, changes to code, infrastructure,
+      policy, documentation, and translations during a release may
+      negatively impact others' work.
+
+      '''Be respectful.''' The Ubuntu community and its members treat
+      one another with respect. Everyone can make a valuable
+      contribution to Ubuntu. We may not always agree, but disagreement
+      is no excuse for poor behaviour and poor manners. We might all
+      experience some frustration now and then, but we cannot allow that
+      frustration to turn into a personal attack. It's important to
+      remember that a community where people feel uncomfortable or
+      threatened is not a productive one. We expect members of the
+      Ubuntu community to be respectful when dealing with other
+      contributors as well as with people outside the Ubuntu project and
+      with users of Ubuntu.
+
+      '''Be collaborative.''' Collaboration is central to Ubuntu and to
+      the larger free software community.  This collaboration involves
+      individuals working with others in teams within Ubuntu, teams
+      working with each other within Ubuntu, and individuals and teams
+      within Ubuntu working with other projects outside. This
+      collaboration reduces redundancy, and improves the quality of our
+      work. Internally and externally, we should always be open to
+      collaboration. Wherever possible, we should work closely with
+      upstream projects and others in the free software community to
+      coordinate our technical, advocacy, documentation, and other work.
+      Our work should be done transparently and we should involve as
+      many interested parties as early as possible.  If we decide to
+      take a different approach than others, we will let them know early,
+      document our work and inform others regularly of our progress.
+
+      '''When we disagree, we consult others.''' Disagreements, both
+      social and technical, happen all the time and the Ubuntu
+      community is no exception. It is important that we resolve
+      disagreements and differing views constructively and with the help
+      of the community and community processes. We have the Technical
+      Board, the Community Council, and a series of other governance
+      bodies which help to decide the right course for Ubuntu. There are
+      also several Project Teams and Team Leaders, who may be able to
+      help us figure out the best direction for Ubuntu. When our goals
+      differ dramatically, we encourage the creation of alternative sets of
+      packages, or derivative distributions, using the Ubuntu Package
+      Management framework, so that the community can test new ideas and
+      contribute to the discussion.
+
+      '''When we are unsure, we ask for help.''' Nobody knows
+      everything, and nobody is expected to be perfect in the Ubuntu
+      community. Asking questions avoids many problems down the road,
+      and so questions are encouraged. Those who are asked questions should
+      be responsive and helpful. However, when asking a question, care must
+      be taken to do so in an appropriate forum.
+
+      '''Step down considerately.''' Members of every project come and
+      go and Ubuntu is no different. When somebody leaves or disengages
+      from the project, in whole or in part, we ask that they do so in a
+      way that minimises disruption to the project. This means they
+      should tell people they are leaving and take the proper steps to
+      ensure that others can pick up where they left off.
+
+We pride ourselves on building a productive, happy and agile community
+that can welcome new ideas in a complex field, and foster collaboration
+between groups with very different needs, interests and goals. We hold
+our leaders to an even higher standard, in the Leadership Code of
+Conduct, and arrange the governance of the community to ensure that
+issues can be raised with leaders who are engaged, interested and
+competent to help resolve them.
+
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iD8DBQFEaldO2yWXVgK6XvYRAocHAKCFr7NSD6jwe5PmUW9I0vM5lWzC2QCgktT7
-1V1PJfbYB/TVw20v/EjJhNw=
-=i+mH
+iEYEARECAAYFAksVcI0ACgkQ2yWXVgK6XvbgDACgqN25IVdVInlqyQ1GWTh32/QT
+wDAAn2VGsn4WxJvnCf6738f2aWPqZ4aK
+=3I88
 -----END PGP SIGNATURE-----

=== modified file 'utilities/migrater/file-ownership.txt'
--- utilities/migrater/file-ownership.txt	2009-09-17 17:29:33 +0000
+++ utilities/migrater/file-ownership.txt	2009-12-02 15:33:16 +0000
@@ -1771,6 +1771,7 @@
     ./emailtemplates/upload-rejection.txt
     ./emailtemplates/bug-notification-verbose.txt
 reg ./codesofconduct
+reg ./codesofconduct/1.1.txt
 reg ./codesofconduct/1.0.1.txt
 reg ./codesofconduct/1.0.txt
 reg ./codesofconduct/README
@@ -2875,7 +2876,7 @@
 reg ./pagetests/gpg-coc/97-cocnotfound.txt
 reg ./pagetests/gpg-coc/98-cocacknowledge.txt
 reg ./pagetests/gpg-coc/99-coc-presentation.txt
-reg ./pagetests/gpg-coc/reformatted_101_coc.asc
+reg ./pagetests/gpg-coc/reformatted_11_coc.asc
 reg ./pagetests/gpg-coc/truncated_coc.asc
 bug ./pagetests/guided-filebug
 bug ./pagetests/guided-filebug/xx-advanced-filebug-tags.txt