diff -Nru click-reviewers-tools-0.20/bin/clickreviews/cr_lint.py click-reviewers-tools-0.21/bin/clickreviews/cr_lint.py --- click-reviewers-tools-0.20/bin/clickreviews/cr_lint.py 2015-01-05 15:57:17.000000000 +0000 +++ click-reviewers-tools-0.21/bin/clickreviews/cr_lint.py 2015-01-14 11:16:27.000000000 +0000 @@ -547,78 +547,6 @@ return self._add_result(t, n, s) - t = 'info' - n = 'maintainer_domain' - s = 'OK' - manual_review = False - defaults = ('com.ubuntu.developer.', 'net.launchpad.') - - # Some domains give out email addresses in their toplevel namespace - # (eg @ubuntu.com is used by Ubuntu members). Anything in these in - # domains should show a warning (for now) - special_domains = ('com.ubuntu', 'com.facebook', 'com.yahoo') - - if self.click_pkgname.startswith(defaults): - # com.ubuntu.developer is Ubuntu's appstore-- people can use their - # own addresses - s = "OK (package domain=%s)" % str(defaults) - else: - domain_rev = self.email.partition('@')[2].split('.') - domain_rev.reverse() - - pkg_domain_rev = self.click_pkgname.split('.') - if len(domain_rev) < 2: # don't impersonate .com - t = 'error' - s = "(EMAIL NEEDS HUMAN REVIEW) email domain too short: '%s'" \ - % self.email - manual_review = True - # also '=' to leave room for app name - elif len(domain_rev) >= len(pkg_domain_rev): - # Core apps have a long email, domain, but that's all right - if self.is_core_app: - t = 'info' - s = "OK (email '%s' long, but special case of core apps " \ - "'com.ubuntu.*')" % self.email - elif self.email == "ubuntu-devel-discuss@lists.ubuntu.com": - t = 'info' - s = "OK (email '%s' long, but special case" % self.email - else: - t = 'error' - s = ("(EMAIL NEEDS HUMAN REVIEW) email domain too long " - "'%s' for app name '%s'" % (self.email, - ".".join(pkg_domain_rev))) - manual_review = True - elif domain_rev == pkg_domain_rev[:len(domain_rev)]: - is_special = False - for special in special_domains: - if self.click_pkgname.startswith(special + '.'): - is_special = True - break - if is_special: - t = 'warn' - s = "email=%s matches special domain=%s" % (self.email, - ".".join(pkg_domain_rev)) - else: - s = "OK (email=%s, package domain=%s)" % (self.email, - ".".join(pkg_domain_rev)) - elif self.is_core_scope: - t = 'info' - s = "OK ('com.ubuntu.scopes' uses '%s' as email)" % self.email - elif self.is_core_snappy: - t = 'info' - s = "OK ('com.ubuntu.snappy' uses '%s' as email)" % self.email - else: - t = 'error' - s = "email=%s does not match package domain=%s " \ - "(Your email domain needs to match the reverse package " \ - "namespace.)" % (self.email, - ".".join(pkg_domain_rev)) - # flat namespaces are ok now - if self.click_pkgname.count('.') < 1: - t = 'info' - s = 'OK (flat namespace)' - self._add_result(t, n, s, manual_review=manual_review) - def check_title(self): '''Check title()''' t = 'info' diff -Nru click-reviewers-tools-0.20/bin/clickreviews/tests/test_cr_lint.py click-reviewers-tools-0.21/bin/clickreviews/tests/test_cr_lint.py --- click-reviewers-tools-0.20/bin/clickreviews/tests/test_cr_lint.py 2015-01-05 15:57:17.000000000 +0000 +++ click-reviewers-tools-0.21/bin/clickreviews/tests/test_cr_lint.py 2015-01-14 11:16:27.000000000 +0000 @@ -462,28 +462,6 @@ expected_counts = {'info': None, 'warn': 0, 'error': 0} self.check_results(r, expected_counts) - def test_check_maintainer_non_default(self): - '''Test check_maintainer() - non-default''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - def test_check_maintainer_non_match(self): - '''Test check_maintainer() - non-match''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 1} - self.check_results(r, expected_counts) - def test_check_maintainer_empty(self): '''Test check_maintainer() - empty''' self.set_test_manifest("maintainer", "") @@ -522,30 +500,6 @@ expected_counts = {'info': None, 'warn': 0, 'error': 1} self.check_results(r, expected_counts) - def test_check_maintainer_bad_email_short_domain(self): - '''Test check_maintainer() - bad email (short domain)''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 1} - self.check_results(r, expected_counts) - self.check_manual_review(r, 'lint_maintainer_domain') - - def test_check_maintainer_bad_email_long_domain(self): - '''Test check_maintainer() - bad email (long domain)''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 1} - self.check_results(r, expected_counts) - self.check_manual_review(r, 'lint_maintainer_domain') - def test_check_maintainer_domain_appstore(self): '''Test check_maintainer() - appstore domain (com.ubuntu.developer)''' @@ -558,99 +512,6 @@ expected_counts = {'info': None, 'warn': 0, 'error': 0} self.check_results(r, expected_counts) - def test_check_maintainer_domain_special(self): - '''Test check_maintainer() - special (com.facebook)''' - self.set_test_control("Package", "com.facebook.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 1, 'error': 0} - self.check_results(r, expected_counts) - - def test_check_maintainer_email_special(self): - '''Test check_maintainer() - ubuntu-devel-discuss@ - app''' - self.set_test_control("Package", "com.canonical.app") - self.set_test_manifest("maintainer", - "Ubuntu Core Developers " - "") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK (email 'ubuntu-devel-discuss@lists.ubuntu.com' long, " - "but special case"} - self.check_results(r, expected=expected) - - def test_check_maintainer_email_special2(self): - '''Test check_maintainer() - ubuntu-devel-discuss@ - scope''' - self.set_test_control("Package", "com.ubuntu.scopes.youtube") - self.set_test_manifest("maintainer", - "Ubuntu Core Developers " - "") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK ('com.ubuntu.scopes' uses " - "'ubuntu-devel-discuss@lists.ubuntu.com' as email)"} - self.check_results(r, expected=expected) - - def test_check_maintainer_email_special3(self): - '''Test check_maintainer() - ubuntu-devel-discuss@ - snappy''' - self.set_test_control("Package", "com.ubuntu.snappy.foo") - self.set_test_manifest("maintainer", - "Ubuntu Core Developers " - "") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK ('com.ubuntu.snappy' uses " - "'ubuntu-devel-discuss@lists.ubuntu.com' as email)"} - self.check_results(r, expected=expected) - - def test_check_maintainer_flat_namespace(self): - '''Test check_maintainer() - flat namespace''' - self.set_test_control("Package", "snapp") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK (flat namespace)"} - self.check_results(r, expected=expected) - def test_check_icon(self): '''Test check_icon()''' self.set_test_manifest("icon", "someicon") diff -Nru click-reviewers-tools-0.20/clickreviews/cr_lint.py click-reviewers-tools-0.21/clickreviews/cr_lint.py --- click-reviewers-tools-0.20/clickreviews/cr_lint.py 2015-01-05 15:57:17.000000000 +0000 +++ click-reviewers-tools-0.21/clickreviews/cr_lint.py 2015-01-14 11:16:27.000000000 +0000 @@ -547,78 +547,6 @@ return self._add_result(t, n, s) - t = 'info' - n = 'maintainer_domain' - s = 'OK' - manual_review = False - defaults = ('com.ubuntu.developer.', 'net.launchpad.') - - # Some domains give out email addresses in their toplevel namespace - # (eg @ubuntu.com is used by Ubuntu members). Anything in these in - # domains should show a warning (for now) - special_domains = ('com.ubuntu', 'com.facebook', 'com.yahoo') - - if self.click_pkgname.startswith(defaults): - # com.ubuntu.developer is Ubuntu's appstore-- people can use their - # own addresses - s = "OK (package domain=%s)" % str(defaults) - else: - domain_rev = self.email.partition('@')[2].split('.') - domain_rev.reverse() - - pkg_domain_rev = self.click_pkgname.split('.') - if len(domain_rev) < 2: # don't impersonate .com - t = 'error' - s = "(EMAIL NEEDS HUMAN REVIEW) email domain too short: '%s'" \ - % self.email - manual_review = True - # also '=' to leave room for app name - elif len(domain_rev) >= len(pkg_domain_rev): - # Core apps have a long email, domain, but that's all right - if self.is_core_app: - t = 'info' - s = "OK (email '%s' long, but special case of core apps " \ - "'com.ubuntu.*')" % self.email - elif self.email == "ubuntu-devel-discuss@lists.ubuntu.com": - t = 'info' - s = "OK (email '%s' long, but special case" % self.email - else: - t = 'error' - s = ("(EMAIL NEEDS HUMAN REVIEW) email domain too long " - "'%s' for app name '%s'" % (self.email, - ".".join(pkg_domain_rev))) - manual_review = True - elif domain_rev == pkg_domain_rev[:len(domain_rev)]: - is_special = False - for special in special_domains: - if self.click_pkgname.startswith(special + '.'): - is_special = True - break - if is_special: - t = 'warn' - s = "email=%s matches special domain=%s" % (self.email, - ".".join(pkg_domain_rev)) - else: - s = "OK (email=%s, package domain=%s)" % (self.email, - ".".join(pkg_domain_rev)) - elif self.is_core_scope: - t = 'info' - s = "OK ('com.ubuntu.scopes' uses '%s' as email)" % self.email - elif self.is_core_snappy: - t = 'info' - s = "OK ('com.ubuntu.snappy' uses '%s' as email)" % self.email - else: - t = 'error' - s = "email=%s does not match package domain=%s " \ - "(Your email domain needs to match the reverse package " \ - "namespace.)" % (self.email, - ".".join(pkg_domain_rev)) - # flat namespaces are ok now - if self.click_pkgname.count('.') < 1: - t = 'info' - s = 'OK (flat namespace)' - self._add_result(t, n, s, manual_review=manual_review) - def check_title(self): '''Check title()''' t = 'info' diff -Nru click-reviewers-tools-0.20/clickreviews/tests/test_cr_lint.py click-reviewers-tools-0.21/clickreviews/tests/test_cr_lint.py --- click-reviewers-tools-0.20/clickreviews/tests/test_cr_lint.py 2015-01-05 15:57:17.000000000 +0000 +++ click-reviewers-tools-0.21/clickreviews/tests/test_cr_lint.py 2015-01-14 11:16:27.000000000 +0000 @@ -462,28 +462,6 @@ expected_counts = {'info': None, 'warn': 0, 'error': 0} self.check_results(r, expected_counts) - def test_check_maintainer_non_default(self): - '''Test check_maintainer() - non-default''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - def test_check_maintainer_non_match(self): - '''Test check_maintainer() - non-match''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 1} - self.check_results(r, expected_counts) - def test_check_maintainer_empty(self): '''Test check_maintainer() - empty''' self.set_test_manifest("maintainer", "") @@ -522,30 +500,6 @@ expected_counts = {'info': None, 'warn': 0, 'error': 1} self.check_results(r, expected_counts) - def test_check_maintainer_bad_email_short_domain(self): - '''Test check_maintainer() - bad email (short domain)''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 1} - self.check_results(r, expected_counts) - self.check_manual_review(r, 'lint_maintainer_domain') - - def test_check_maintainer_bad_email_long_domain(self): - '''Test check_maintainer() - bad email (long domain)''' - self.set_test_control("Package", "com.example.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 1} - self.check_results(r, expected_counts) - self.check_manual_review(r, 'lint_maintainer_domain') - def test_check_maintainer_domain_appstore(self): '''Test check_maintainer() - appstore domain (com.ubuntu.developer)''' @@ -558,99 +512,6 @@ expected_counts = {'info': None, 'warn': 0, 'error': 0} self.check_results(r, expected_counts) - def test_check_maintainer_domain_special(self): - '''Test check_maintainer() - special (com.facebook)''' - self.set_test_control("Package", "com.facebook.app") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 1, 'error': 0} - self.check_results(r, expected_counts) - - def test_check_maintainer_email_special(self): - '''Test check_maintainer() - ubuntu-devel-discuss@ - app''' - self.set_test_control("Package", "com.canonical.app") - self.set_test_manifest("maintainer", - "Ubuntu Core Developers " - "") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK (email 'ubuntu-devel-discuss@lists.ubuntu.com' long, " - "but special case"} - self.check_results(r, expected=expected) - - def test_check_maintainer_email_special2(self): - '''Test check_maintainer() - ubuntu-devel-discuss@ - scope''' - self.set_test_control("Package", "com.ubuntu.scopes.youtube") - self.set_test_manifest("maintainer", - "Ubuntu Core Developers " - "") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK ('com.ubuntu.scopes' uses " - "'ubuntu-devel-discuss@lists.ubuntu.com' as email)"} - self.check_results(r, expected=expected) - - def test_check_maintainer_email_special3(self): - '''Test check_maintainer() - ubuntu-devel-discuss@ - snappy''' - self.set_test_control("Package", "com.ubuntu.snappy.foo") - self.set_test_manifest("maintainer", - "Ubuntu Core Developers " - "") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK ('com.ubuntu.snappy' uses " - "'ubuntu-devel-discuss@lists.ubuntu.com' as email)"} - self.check_results(r, expected=expected) - - def test_check_maintainer_flat_namespace(self): - '''Test check_maintainer() - flat namespace''' - self.set_test_control("Package", "snapp") - self.set_test_manifest("maintainer", - "Foo User ") - c = ClickReviewLint(self.test_name) - c.check_maintainer() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 0} - self.check_results(r, expected_counts) - - expected = dict() - expected['info'] = dict() - expected['warn'] = dict() - expected['error'] = dict() - expected['info']['lint_maintainer_domain'] = \ - {"text": "OK (flat namespace)"} - self.check_results(r, expected=expected) - def test_check_icon(self): '''Test check_icon()''' self.set_test_manifest("icon", "someicon") diff -Nru click-reviewers-tools-0.20/debian/bzr-builder.manifest click-reviewers-tools-0.21/debian/bzr-builder.manifest --- click-reviewers-tools-0.20/debian/bzr-builder.manifest 2015-01-05 15:57:17.000000000 +0000 +++ click-reviewers-tools-0.21/debian/bzr-builder.manifest 2015-01-14 11:16:27.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~349 -lp:click-reviewers-tools revid:daniel.holbach@canonical.com-20150105155230-ub1u5v0jzu3u3er6 +# bzr-builder format 0.3 deb-version {debupstream}-0~353 +lp:click-reviewers-tools revid:daniel.holbach@canonical.com-20150114111411-57fg94lj10rlykcb diff -Nru click-reviewers-tools-0.20/debian/changelog click-reviewers-tools-0.21/debian/changelog --- click-reviewers-tools-0.20/debian/changelog 2015-01-05 15:57:17.000000000 +0000 +++ click-reviewers-tools-0.21/debian/changelog 2015-01-14 11:16:27.000000000 +0000 @@ -1,14 +1,23 @@ -click-reviewers-tools (0.20-0~349~ubuntu14.04.1) trusty; urgency=low +click-reviewers-tools (0.21-0~353~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Daniel Holbach Mon, 05 Jan 2015 15:57:17 +0000 + -- Daniel Holbach Wed, 14 Jan 2015 11:16:27 +0000 -click-reviewers-tools (0.20) UNRELEASED; urgency=medium +click-reviewers-tools (0.21) UNRELEASED; urgency=medium * - -- Daniel Holbach Mon, 05 Jan 2015 16:52:10 +0100 + -- Daniel Holbach Wed, 14 Jan 2015 12:13:56 +0100 + +click-reviewers-tools (0.20) vivid; urgency=medium + + [ Martin Albisetti ] + * Remove checks that validate namespaces and email addresses, those are + better suited for the store, which knows the information about the + uploading user. (LP: #1408644) + + -- Daniel Holbach Wed, 14 Jan 2015 12:12:25 +0100 click-reviewers-tools (0.19) vivid; urgency=medium