launchpad-reviewers team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/launchpad/coc-2.0 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~dholbach/launchpad/coc-2.0/+merge/133702
-- 
https://code.launchpad.net/~dholbach/launchpad/coc-2.0/+merge/133702
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~dholbach/launchpad/coc-2.0 into lp:launchpad.

=== modified file 'lib/lp/registry/browser/tests/test_codeofconduct.py'
--- lib/lp/registry/browser/tests/test_codeofconduct.py	2012-02-01 15:26:32 +0000
+++ lib/lp/registry/browser/tests/test_codeofconduct.py	2012-11-09 15:48:24 +0000
@@ -160,11 +160,11 @@
 
     def test_response(self):
         """Ensure the headers and body are as expected."""
-        coc = getUtility(ICodeOfConductSet)['1.1']
+        coc = getUtility(ICodeOfConductSet)['2.0']
         content = coc.content
         browser = self.getViewBrowser(coc, '+download')
         self.assertEqual(content, browser.contents)
         self.assertEqual(str(len(content)), browser.headers['Content-length'])
-        disposition = 'attachment; filename="UbuntuCodeofConduct-1.1.txt"'
+        disposition = 'attachment; filename="UbuntuCodeofConduct-2.0.txt"'
         self.assertEqual(disposition, browser.headers['Content-disposition'])
         self.assertEqual('text/plain', browser.headers['Content-type'])

=== added file 'lib/lp/registry/codesofconduct/2.0.txt'
--- lib/lp/registry/codesofconduct/2.0.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/codesofconduct/2.0.txt	2012-11-09 15:48:24 +0000
@@ -0,0 +1,202 @@
+= Ubuntu Code of Conduct v2.0 =
+
+== Community ==
+
+Ubuntu is about showing humanity to one another: the word itself
+captures the spirit of being human.
+
+We want a productive, happy and agile community that can welcome new
+ideas in a complex field, improve every process every year, and foster
+collaboration between groups with very different needs, interests and
+skills.
+
+We gain strength from diversity, and actively seek participation from
+those who enhance it. This code of conduct exists to ensure that
+diverse groups collaborate to mutual advantage and enjoyment. We will
+challenge prejudice that could jeopardise the participation of any
+person in the project.
+
+The Code of Conduct governs how we behave in public or in private
+whenever the project will be judged by our actions. We expect it to be
+honored by everyone who represents the project officially or
+informally, claims affiliation with the project, or participates
+directly.
+
+We strive to:
+
+  '''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 consider them when making decisions.
+
+  '''Be respectful.'''
+
+  Disagreement is no excuse for poor manners. We work together to
+  resolve conflict, assume good intentions and do our best to act in
+  an empathic fashion. We don't allow frustration to turn into a
+  personal attack. A community where people feel uncomfortable or
+  threatened is not a productive one.
+
+  '''Take responsibility for our words and our actions.'''
+
+  We can all make mistakes; when we do, we take responsibility for
+  them. If someone has been harmed or offended, we listen carefully
+  and respectfully, and work to right the wrong.
+
+  '''Be collaborative.'''
+
+  What we produce is a complex whole made of many parts, it is the sum
+  of many dreams. Collaboration between teams that each have their own
+  goal and vision is essential; for the whole to be more than the sum
+  of its parts, each part must make an effort to understand the whole.
+
+  Collaboration reduces redundancy and improves the quality of our
+  work. Internally and externally, we celebrate good collaboration.
+  Wherever possible, we work closely with upstream projects and others
+  in the free software community to coordinate our efforts.
+
+  We prefer to work transparently and involve interested parties as
+  early as possible.
+
+  '''Value decisiveness, clarity and consensus.'''
+
+  Disagreements, social and technical, are normal, but we do not allow
+  them to persist and fester leaving others uncertain of the agreed
+  direction.
+
+  We expect participants in the project to resolve disagreements
+  constructively. When they cannot, we escalate the matter to
+  structures with designated leaders to arbitrate and provide clarity
+  and direction.
+
+  '''Ask for help when unsure.'''
+
+  Nobody is expected to be perfect in this community. Asking questions
+  early avoids many problems later, so questions are encouraged,
+  though they may be directed to the appropriate forum. Those who are
+  asked should be responsive and helpful.
+
+  '''Step down considerately.'''
+
+  When somebody leaves or disengages from the project, we ask that
+  they do so in a way that minimises disruption to the project. They
+  should tell people they are leaving and take the proper steps to
+  ensure that others can pick up where they left off.
+
+
+== Leadership, Authority and Responsibility ==
+
+We all lead by example, in debate and in action. We encourage new
+participants to feel empowered to lead, to take action, and to
+experiment when they feel innovation could improve the project.
+Leadership can be exercised by anyone simply by taking action, there
+is no need to wait for recognition when the opportunity to lead
+presents itself.
+
+'''Delegation from the top.'''
+
+Responsibility for the project starts with the "benevolent dictator",
+who delegates specific responsibilities and the corresponding
+authority to a series of teams, councils and individuals, starting
+with the Community Council ("CC"). That Council or its delegated
+representative will arbitrate in any dispute.
+
+We are a meritocracy; we delegate decision making, governance and
+leadership from senior bodies to the most able and engaged candidates.
+
+'''Support for delegation is measured'''
+
+Nominations to the boards and councils are at the discretion of the
+Community Council, however the Community Council will seek the input
+of the community before confirming appointments.
+
+Leadership is not an award, right, or title; it is a privilege, a
+responsibility and a mandate. A leader will only retain their
+authority as long as they retain the support of those who delegated
+that authority to them.
+
+'''We value discussion, data and decisiveness.'''
+
+We gather opinions, data and commitments from concerned parties before
+taking a decision. We expect leaders to help teams come to a decision
+in a reasonable time, to seek guidance or be willing to take the
+decision themselves when consensus is lacking, and to take
+responsibility for implementation.
+
+The poorest decision of all is no decision: clarity of direction has
+value in itself. Sometimes all the data are not available, or
+consensus is elusive. A decision must still be made. There is no
+guarantee of a perfect decision every time - we prefer to err, learn,
+and err less in future than to postpone action indefinitely.
+
+We recognise that the project works better when we trust the teams
+closest to a problem to make the decision for the project. If we learn
+of a decision that we disagree with, we can engage the relevant team
+to find common ground, and failing that, we have a governance
+structure that can review the decision. Ultimately, if a decision has
+been taken by the people responsible for it, and is supported by the
+project governance, it will stand. None of us expects to agree with
+every decision, and we value highly the willingness to stand by the
+project and help it deliver even on the occasions when we ourselves
+may prefer a different route.
+
+'''Open meritocracy.'''
+
+We invite anybody, from any company, to participate in any aspect of
+the project. Our community is open, and any responsibility can be
+carried by any contributor who demonstrates the required capacity and
+competence.
+
+'''Teamwork'''
+
+A leader's foremost goal is the success of the team.
+
+"A virtuoso is judged by their actions; a leader is judged by the
+actions of their team." A leader knows when to act and when to step
+back. They know when to delegate work, and when to take it upon
+themselves.
+
+'''Credit'''
+
+A good leader does not seek the limelight, but celebrates team members
+for the work they do. Leaders may be more visible than members of the
+team, good ones use that visibility to highlight the great work of
+others.
+
+'''Courage and considerateness'''
+
+Leadership occasionally requires bold decisions that will not be
+widely understood, consensual or popular. We value the courage to take
+such decisions, because they enable the project as a whole to move
+forward faster than we could if we required complete consensus.
+Nevertheless, boldness demands considerateness; take bold decisions,
+but do so mindful of the challenges they present for others, and work
+to soften the impact of those decisions on them. Communicating changes
+and their reasoning clearly and early on is as important as the
+implementation of the change itself.
+
+'''Conflicts of Interest'''
+
+We expect leaders to be aware when they are conflicted due to
+employment or other projects they are involved in, and abstain or
+delegate decisions that may be seen to be self-interested. We expect
+that everyone who participates in the project does so with the goal of
+making life better for its users.
+
+When in doubt, ask for a second opinion. Perceived conflicts of
+interest are important to address; as a leader, act to ensure that
+decisions are credible even if they must occasionally be unpopular,
+difficult or favourable to the interests of one group over another.
+
+This Code is not exhaustive or complete. It is not a rulebook; it
+serves to distill our common understanding of a collaborative, shared
+environment and goals. We expect it to be followed in spirit as much
+as in the letter.
+
+
+'''The Ubuntu Code of Conduct is licensed under the
+[[http://creativecommons.org/licenses/by-sa/3.0/|Creative Commons
+Attribution-Share Alike 3.0 license]]. You may re-use it for your own
+project, and modify it as you wish, just please allow others to use
+your modifications and give credit to the Ubuntu Project!'''

=== modified file 'lib/lp/registry/model/codeofconduct.py'
--- lib/lp/registry/model/codeofconduct.py	2012-06-29 08:40:05 +0000
+++ lib/lp/registry/model/codeofconduct.py	2012-11-09 15:48:24 +0000
@@ -62,7 +62,7 @@
 
     path = 'lib/lp/registry/codesofconduct/'
     prefix = 'Ubuntu Code of Conduct - '
-    currentrelease = '1.1'
+    currentrelease = '2.0'
     # 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

=== added file 'lib/lp/registry/stories/gpg-coc/reformatted_20_coc.asc'
--- lib/lp/registry/stories/gpg-coc/reformatted_20_coc.asc	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/stories/gpg-coc/reformatted_20_coc.asc	2012-11-09 15:48:24 +0000
@@ -0,0 +1,213 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+= Ubuntu Code of Conduct v2.0 =
+
+== Community ==
+
+Ubuntu is about showing humanity to one another: the word itself
+captures the spirit of being human.
+
+We want a productive, happy and agile community that can welcome new
+ideas in a complex field, improve every process every year, and foster
+collaboration between groups with very different needs, interests and
+skills.
+
+We gain strength from diversity, and actively seek participation from
+those who enhance it. This code of conduct exists to ensure that
+diverse groups collaborate to mutual advantage and enjoyment. We will
+challenge prejudice that could jeopardise the participation of any
+person in the project.
+
+The Code of Conduct governs how we behave in public or in private
+whenever the project will be judged by our actions. We expect it to be
+honored by everyone who represents the project officially or
+informally, claims affiliation with the project, or participates
+directly.
+
+We strive to:
+
+  '''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 consider them when making decisions.
+
+  '''Be respectful.'''
+
+  Disagreement is no excuse for poor manners. We work together to
+  resolve conflict, assume good intentions and do our best to act in
+  an empathic fashion. We don't allow frustration to turn into a
+  personal attack. A community where people feel uncomfortable or
+  threatened is not a productive one.
+
+  '''Take responsibility for our words and our actions.'''
+
+  We can all make mistakes; when we do, we take responsibility for
+  them. If someone has been harmed or offended, we listen carefully
+  and respectfully, and work to right the wrong.
+
+  '''Be collaborative.'''
+
+  What we produce is a complex whole made of many parts, it is the sum
+  of many dreams. Collaboration between teams that each have their own
+  goal and vision is essential; for the whole to be more than the sum
+  of its parts, each part must make an effort to understand the whole.
+
+  Collaboration reduces redundancy and improves the quality of our
+  work. Internally and externally, we celebrate good collaboration.
+  Wherever possible, we work closely with upstream projects and others
+  in the free software community to coordinate our efforts.
+
+  We prefer to work transparently and involve interested parties as
+  early as possible.
+
+  '''Value decisiveness, clarity and consensus.'''
+
+  Disagreements, social and technical, are normal, but we do not allow
+  them to persist and fester leaving others uncertain of the agreed
+  direction.
+
+  We expect participants in the project to resolve disagreements
+  constructively. When they cannot, we escalate the matter to
+  structures with designated leaders to arbitrate and provide clarity
+  and direction.
+
+  '''Ask for help when unsure.'''
+
+  Nobody is expected to be perfect in this community. Asking questions
+  early avoids many problems later, so questions are encouraged,
+  though they may be directed to the appropriate forum. Those who are
+  asked should be responsive and helpful.
+
+  '''Step down considerately.'''
+
+  When somebody leaves or disengages from the project, we ask that
+  they do so in a way that minimises disruption to the project. They
+  should tell people they are leaving and take the proper steps to
+  ensure that others can pick up where they left off.
+
+
+== Leadership, Authority and Responsibility ==
+
+We all lead by example, in debate and in action. We encourage new
+participants to feel empowered to lead, to take action, and to
+experiment when they feel innovation could improve the project.
+Leadership can be exercised by anyone simply by taking action, there
+is no need to wait for recognition when the opportunity to lead
+presents itself.
+
+'''Delegation from the top.'''
+
+Responsibility for the project starts with the "benevolent dictator",
+who delegates specific responsibilities and the corresponding
+authority to a series of teams, councils and individuals, starting
+with the Community Council ("CC"). That Council or its delegated
+representative will arbitrate in any dispute.
+
+We are a meritocracy; we delegate decision making, governance and
+leadership from senior bodies to the most able and engaged candidates.
+
+'''Support for delegation is measured'''
+
+Nominations to the boards and councils are at the discretion of the
+Community Council, however the Community Council will seek the input
+of the community before confirming appointments.
+
+Leadership is not an award, right, or title; it is a privilege, a
+responsibility and a mandate. A leader will only retain their
+authority as long as they retain the support of those who delegated
+that authority to them.
+
+'''We value discussion, data and decisiveness.'''
+
+We gather opinions, data and commitments from concerned parties before
+taking a decision. We expect leaders to help teams come to a decision
+in a reasonable time, to seek guidance or be willing to take the
+decision themselves when consensus is lacking, and to take
+responsibility for implementation.
+
+The poorest decision of all is no decision: clarity of direction has
+value in itself. Sometimes all the data are not available, or
+consensus is elusive. A decision must still be made. There is no
+guarantee of a perfect decision every time - we prefer to err, learn,
+and err less in future than to postpone action indefinitely.
+
+We recognise that the project works better when we trust the teams
+closest to a problem to make the decision for the project. If we learn
+of a decision that we disagree with, we can engage the relevant team
+to find common ground, and failing that, we have a governance
+structure that can review the decision. Ultimately, if a decision has
+been taken by the people responsible for it, and is supported by the
+project governance, it will stand. None of us expects to agree with
+every decision, and we value highly the willingness to stand by the
+project and help it deliver even on the occasions when we ourselves
+may prefer a different route.
+
+'''Open meritocracy.'''
+
+We invite anybody, from any company, to participate in any aspect of
+the project. Our community is open, and any responsibility can be
+carried by any contributor who demonstrates the required capacity and
+competence.
+
+'''Teamwork'''
+
+A leader's foremost goal is the success of the team.
+
+"A virtuoso is judged by their actions; a leader is judged by the
+actions of their team." A leader knows when to act and when to step
+back. They know when to delegate work, and when to take it upon
+themselves.
+
+'''Credit'''
+
+A good leader does not seek the limelight, but celebrates team members
+for the work they do. Leaders may be more visible than members of the
+team, good ones use that visibility to highlight the great work of
+others.
+
+'''Courage and considerateness'''
+
+Leadership occasionally requires bold decisions that will not be
+widely understood, consensual or popular. We value the courage to take
+such decisions, because they enable the project as a whole to move
+forward faster than we could if we required complete consensus.
+Nevertheless, boldness demands considerateness; take bold decisions,
+but do so mindful of the challenges they present for others, and work
+to soften the impact of those decisions on them. Communicating changes
+and their reasoning clearly and early on is as important as the
+implementation of the change itself.
+
+'''Conflicts of Interest'''
+
+We expect leaders to be aware when they are conflicted due to
+employment or other projects they are involved in, and abstain or
+delegate decisions that may be seen to be self-interested. We expect
+that everyone who participates in the project does so with the goal of
+making life better for its users.
+
+When in doubt, ask for a second opinion. Perceived conflicts of
+interest are important to address; as a leader, act to ensure that
+decisions are credible even if they must occasionally be unpopular,
+difficult or favourable to the interests of one group over another.
+
+This Code is not exhaustive or complete. It is not a rulebook; it
+serves to distill our common understanding of a collaborative, shared
+environment and goals. We expect it to be followed in spirit as much
+as in the letter.
+
+
+'''The Ubuntu Code of Conduct is licensed under the
+[[http://creativecommons.org/licenses/by-sa/3.0/|Creative Commons
+Attribution-Share Alike 3.0 license]]. You may re-use it for your own
+project, and modify it as you wish, just please allow others to use
+your modifications and give credit to the Ubuntu Project!'''
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAksVcI0ACgkQ2yWXVgK6XvbgDACgqN25IVdVInlqyQ1GWTh32/QT
+wDAAn2VGsn4WxJvnCf6738f2aWPqZ4aK
+=3I88
+-----END PGP SIGNATURE-----

=== modified file 'lib/lp/registry/stories/gpg-coc/xx-gpg-coc.txt'
--- lib/lp/registry/stories/gpg-coc/xx-gpg-coc.txt	2012-08-21 14:39:52 +0000
+++ lib/lp/registry/stories/gpg-coc/xx-gpg-coc.txt	2012-11-09 15:48:24 +0000
@@ -397,7 +397,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.1/+sign')
+    >>> browser.open('http://launchpad.dev/codeofconduct/2.0/+sign')
     >>> browser.getControl('Signed Code').value = truncated_coc
     >>> browser.getControl('Continue').click()
     >>> print_errors(browser.contents)
@@ -422,11 +422,11 @@
     >>> browser.open('http://launchpad.dev/codeofconduct/1.0/+sign')
     >>> browser.getLink('the current version').click()
     >>> print browser.url
-    http://launchpad.dev/codeofconduct/1.1
+    http://launchpad.dev/codeofconduct/2.0
 
     >>> browser.getLink('Sign it').click()
     >>> print browser.url
-    http://launchpad.dev/codeofconduct/1.1/+sign
+    http://launchpad.dev/codeofconduct/2.0/+sign
 
 
 Code of Conduct registration
@@ -436,7 +436,7 @@
 has leading spaces removed.  This succeeds because the words the same and
 appear in the same order.
 
-    >>> reformatted_coc = read_file('reformatted_11_coc.asc')
+    >>> reformatted_coc = read_file('reformatted_20_coc.asc')
     >>> browser.getControl('Signed Code').value = reformatted_coc
     >>> browser.getControl('Continue').click()
     >>> print browser.url
@@ -688,11 +688,11 @@
   >>> browser.open('http://localhost:9000/codeofconduct')
   >>> browser.getLink('current version').click()
 
-  >>> 'Ubuntu Code of Conduct - 1.1' in browser.contents
+  >>> 'Ubuntu Code of Conduct - 2.0' in browser.contents
   True
 
   >>> browser.getLink('Sign it').url
-  'http://localhost:9000/codeofconduct/1.1/+sign'
+  'http://localhost:9000/codeofconduct/2.0/+sign'
 
   >>> browser.getLink('Download this version').url
-  'http://localhost:9000/codeofconduct/1.1/+download'
+  'http://localhost:9000/codeofconduct/2.0/+download'

=== modified file 'lib/lp/services/webapp/doc/canonical_url_examples.txt'
--- lib/lp/services/webapp/doc/canonical_url_examples.txt	2012-05-22 12:05:51 +0000
+++ lib/lp/services/webapp/doc/canonical_url_examples.txt	2012-11-09 15:48:24 +0000
@@ -94,8 +94,8 @@
 
 An ICodeOfConduct
 
-    >>> canonical_url(cocset['1.1'])
-    u'http://launchpad.dev/codeofconduct/1.1'
+    >>> canonical_url(cocset['2.0'])
+    u'http://launchpad.dev/codeofconduct/2.0'
 
 
 Distributions, distroseriess and so on