William Grant has proposed merging lp:~wgrant/launchpad/purge-shipit-cruft into lp:launchpad.
Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~wgrant/launchpad/purge-shipit-cruft/+merge/58616 This branch removes all ShipIt references from non-test code, except for code handling ShipIt-created persons and the ShipIt detection in global search. shipit-admins is no longer a celebrity -- just a disgraced team. Some ShipIt-specific publisher and OpenID hacks are gone. -- https://code.launchpad.net/~wgrant/launchpad/purge-shipit-cruft/+merge/58616 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/purge-shipit-cruft into lp:launchpad.
=== modified file 'configs/development/launchpad-lazr.conf' --- configs/development/launchpad-lazr.conf 2011-03-23 18:29:09 +0000 +++ configs/development/launchpad-lazr.conf 2011-04-21 05:41:09 +0000 @@ -335,15 +335,6 @@ [vhost.ubuntu_openid] hostname: ubuntu-openid.launchpad.dev -[vhost.shipitubuntu] -hostname: shipit.ubuntu.dev - -[vhost.shipitkubuntu] -hostname: shipit.kubuntu.dev - -[vhost.shipitedubuntu] -hostname: shipit.edubuntu.dev - [vhost.xmlrpc] hostname: xmlrpc.launchpad.dev rooturl: http://launchpad.dev/ === modified file 'configs/development/local-launchpad-apache' --- configs/development/local-launchpad-apache 2010-07-27 05:09:58 +0000 +++ configs/development/local-launchpad-apache 2011-04-21 05:41:09 +0000 @@ -128,9 +128,6 @@ <VirtualHost 127.0.0.88:443> ServerName launchpad.dev ServerAlias *.launchpad.dev - ServerAlias shipit.edubuntu.dev - ServerAlias shipit.kubuntu.dev - ServerAlias shipit.ubuntu.dev <Proxy *> Order deny,allow Allow from 127.0.0.0/255.0.0.0 @@ -160,9 +157,6 @@ <VirtualHost 127.0.0.88:80> ServerName launchpad.dev ServerAlias *.launchpad.dev - ServerAlias shipit.edubuntu.dev - ServerAlias shipit.kubuntu.dev - ServerAlias shipit.ubuntu.dev RewriteEngine On RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] </VirtualHost> === modified file 'configs/testrunner-appserver/launchpad-lazr.conf' --- configs/testrunner-appserver/launchpad-lazr.conf 2010-03-01 20:48:21 +0000 +++ configs/testrunner-appserver/launchpad-lazr.conf 2011-04-21 05:41:09 +0000 @@ -46,15 +46,6 @@ [vhost.testopenid] rooturl: http://testopenid.dev:8085/ -[vhost.shipitubuntu] -rooturl: http://shipit.ubuntu.dev:8085/ - -[vhost.shipitkubuntu] -rooturl: http://shipit.kubuntu.dev:8085/ - -[vhost.shipitedubuntu] -rooturl: http://shipit.edubuntu.dev:8085/ - [vhost.xmlrpc] rooturl: http://launchpad.dev:8085/ === modified file 'lib/canonical/config/schema-lazr.conf' --- lib/canonical/config/schema-lazr.conf 2011-04-13 05:03:04 +0000 +++ lib/canonical/config/schema-lazr.conf 2011-04-21 05:41:09 +0000 @@ -1850,35 +1850,6 @@ copy_to_zlog: false -[shipit] -# The database user which will be used by this process. -# datatype: string -dbuser: shipit -storm_cache: generational -storm_cache_size: 500 - -# datatype: string -admins_email_address: [email protected] - -# datatype: integer -max_cds_for_auto_approval: 39 - -# datatype: string -ubuntu_from_email_address: [email protected] - -# datatype: string -edubuntu_from_email_address: [email protected] - -# datatype: string -kubuntu_from_email_address: [email protected] - -# datatype: boolean -prerelease_mode: False - -# datatype: string -beta_download_link: http://www.ubuntu.com/testing/hardy/beta - - # For the personal standing updater cron script. [standingupdater] dbuser: standingupdater @@ -2096,12 +2067,6 @@ [vhost.ubuntu_openid] -[vhost.shipitubuntu] - -[vhost.shipitkubuntu] - -[vhost.shipitedubuntu] - [vhost.xmlrpc] [vhost.xmlrpc_private.optional] === modified file 'lib/canonical/configure.zcml' --- lib/canonical/configure.zcml 2011-04-19 14:13:21 +0000 +++ lib/canonical/configure.zcml 2011-04-21 05:41:09 +0000 @@ -134,4 +134,5 @@ <include package="canonical.launchpad" /> <include package="canonical.lazr" /> + </configure> === modified file 'lib/canonical/launchpad/browser/launchpad.py' --- lib/canonical/launchpad/browser/launchpad.py 2011-03-23 16:28:51 +0000 +++ lib/canonical/launchpad/browser/launchpad.py 2011-04-21 05:41:09 +0000 @@ -718,12 +718,6 @@ if WebServiceLayer.providedBy(self.request): return None - # If the hostname for our URL isn't under the main site - # (e.g. shipit.ubuntu.com), don't redirect. - uri = URI(self.request.getURL()) - if not uri.host.endswith(config.vhost.mainsite.hostname): - return None - # If the request is for a bug then redirect straight to that bug. bug_match = re.match("/bugs/(\d+)$", self.request['PATH_INFO']) if bug_match: === modified file 'lib/canonical/launchpad/database/account.py' --- lib/canonical/launchpad/database/account.py 2010-11-11 11:55:53 +0000 +++ lib/canonical/launchpad/database/account.py 2011-04-21 05:41:09 +0000 @@ -274,11 +274,6 @@ password_is_encrypted=False, openid_identifier=None): """See `IAccountSet`.""" - # XXX bug=628832 StuartBishop 20100903: ShipIt is sending us byte - # strings. Call sites should send unicode strings. - if isinstance(openid_identifier, str): - openid_identifier = openid_identifier.decode('US-ASCII') - # Convert the PersonCreationRationale to an AccountCreationRationale. account_rationale = getattr(AccountCreationRationale, rationale.name) account = self.new( @@ -305,10 +300,6 @@ def getByOpenIDIdentifier(self, openid_identifier): """See `IAccountSet`.""" store = IStore(Account) - # XXX bug=628832 StuartBishop 20100903: ShipIt is sending us byte - # strings. Call sites should send unicode strings. - if isinstance(openid_identifier, str): - openid_identifier = openid_identifier.decode('US-ASCII') account = store.find( Account, Account.id == OpenIdIdentifier.account_id, === modified file 'lib/canonical/launchpad/doc/webapp-publication.txt' --- lib/canonical/launchpad/doc/webapp-publication.txt 2010-11-06 12:50:22 +0000 +++ lib/canonical/launchpad/doc/webapp-publication.txt 2011-04-21 05:41:09 +0000 @@ -69,18 +69,6 @@ rooturl: http://openid.launchpad.dev/ althosts: ---- - shipitedubuntu @ shipit.edubuntu.dev - rooturl: http://shipit.edubuntu.dev/ - althosts: - ---- - shipitkubuntu @ shipit.kubuntu.dev - rooturl: http://shipit.kubuntu.dev/ - althosts: - ---- - shipitubuntu @ shipit.ubuntu.dev - rooturl: http://shipit.ubuntu.dev/ - althosts: - ---- testopenid @ testopenid.dev rooturl: http://testopenid.dev/ althosts: @@ -122,9 +110,6 @@ launchpad.dev localhost openid.launchpad.dev - shipit.edubuntu.dev - shipit.kubuntu.dev - shipit.ubuntu.dev testopenid.dev translations.launchpad.dev ubuntu-openid.launchpad.dev === modified file 'lib/canonical/launchpad/interfaces/launchpad.py' --- lib/canonical/launchpad/interfaces/launchpad.py 2010-12-17 17:49:50 +0000 +++ lib/canonical/launchpad/interfaces/launchpad.py 2011-04-21 05:41:09 +0000 @@ -126,7 +126,6 @@ registry_experts = Attribute("The Registry Administrators team.") rosetta_experts = Attribute("The Rosetta Experts team.") savannah_tracker = Attribute("The GNU Savannah Bug Tracker.") - shipit_admin = Attribute("The ShipIt Administrators.") sourceforge_tracker = Attribute("The SourceForge Bug Tracker") ubuntu = Attribute("The Ubuntu Distribution.") ubuntu_archive_mirror = Attribute("The main archive mirror for Ubuntu.") @@ -200,9 +199,6 @@ in_rosetta_experts = Bool( title=_("True if this person is a rosetta expert."), required=True, readonly=True) - in_shipit_admin = Bool( - title=_("True if this person is a ShipIt admin."), - required=True, readonly=True) in_ubuntu_branches = Bool( title=_("True if this person is on the Ubuntu branches team."), required=True, readonly=True) === modified file 'lib/canonical/launchpad/pagetitles.py' --- lib/canonical/launchpad/pagetitles.py 2011-01-28 04:08:32 +0000 +++ lib/canonical/launchpad/pagetitles.py 2011-04-21 05:41:09 +0000 @@ -316,40 +316,6 @@ series_bug_nominations = ContextDisplayName('Bugs nominated for %s') -shipit_adminrequest = 'ShipIt admin request' - -shipit_exports = 'ShipIt exports' - -shipit_forbidden = 'Forbidden' - -shipit_index = 'ShipIt' - -shipit_index_edubuntu = 'Getting Edubuntu' - -shipit_index_ubuntu = 'Request an Ubuntu CD' - -shipit_login = 'ShipIt' - -shipit_login_error = 'ShipIt - Unsuccessful login' - -shipit_myrequest = "Your Ubuntu CD order" - -shipit_oops = 'Error: Oops' - -shipit_reports = 'ShipIt reports' - -shipit_requestcds = 'Your Ubuntu CD Request' - -shipit_survey = 'Ubuntu Server Edition survey' - -shipitrequests_index = 'ShipIt requests' - -shipitrequests_search = 'Search ShipIt requests' - -shipitrequest_edit = 'Edit ShipIt request' - -shipit_notfound = 'Error: Page not found' - signedcodeofconduct_index = ContextDisplayName('%s') signedcodeofconduct_add = ContextTitle('Sign %s') @@ -360,12 +326,6 @@ signedcodeofconduct_deactivate = ContextDisplayName('Deactivating %s') -standardshipitrequests_index = 'Standard ShipIt options' - -standardshipitrequest_new = 'Create a new standard option' - -standardshipitrequest_edit = 'Edit standard option' - team_newpoll = ContextTitle('New poll for team %s') team_polls = ContextTitle('Polls for team %s') === modified file 'lib/canonical/launchpad/utilities/celebrities.py' --- lib/canonical/launchpad/utilities/celebrities.py 2010-12-17 17:49:50 +0000 +++ lib/canonical/launchpad/utilities/celebrities.py 2011-04-21 05:41:09 +0000 @@ -151,7 +151,6 @@ registry_experts = PersonCelebrityDescriptor('registry') rosetta_experts = PersonCelebrityDescriptor('rosetta-admins') savannah_tracker = CelebrityDescriptor(IBugTrackerSet, 'savannah') - shipit_admin = PersonCelebrityDescriptor('shipit-admins') sourceforge_tracker = CelebrityDescriptor(IBugTrackerSet, 'sf') ubuntu = CelebrityDescriptor(IDistributionSet, 'ubuntu') ubuntu_branches = PersonCelebrityDescriptor('ubuntu-branches') === modified file 'lib/canonical/launchpad/webapp/interfaces.py' --- lib/canonical/launchpad/webapp/interfaces.py 2011-03-23 16:28:51 +0000 +++ lib/canonical/launchpad/webapp/interfaces.py 2011-04-21 05:41:09 +0000 @@ -37,9 +37,6 @@ from zope.traversing.interfaces import IContainmentRoot from canonical.launchpad import _ -# Import only added to allow change to land. Needs to be removed when shipit -# is updated. -from lp.app.errors import UnexpectedFormData class IAPIDocRoot(IContainmentRoot): === modified file 'lib/canonical/launchpad/webapp/metazcml.py' --- lib/canonical/launchpad/webapp/metazcml.py 2010-10-02 06:27:13 +0000 +++ lib/canonical/launchpad/webapp/metazcml.py 2011-04-21 05:41:09 +0000 @@ -697,12 +697,9 @@ # needs to be unique -- and to do nothing if no hostname is # configured for this publisher. - # shipit, uniquely, uses a different name in its <publisher> - # directives to the name of the section in the config. - if not name.startswith('shipit'): - section = getattr(config.vhost, name, None) - if section is None or section.hostname is None: - return + section = getattr(config.vhost, name, None) + if section is None or section.hostname is None: + return global _arbitrary_priority if priority is None: _arbitrary_priority += 1 === modified file 'lib/canonical/launchpad/webapp/publisher.py' --- lib/canonical/launchpad/webapp/publisher.py 2011-04-07 05:09:15 +0000 +++ lib/canonical/launchpad/webapp/publisher.py 2011-04-21 05:41:09 +0000 @@ -496,8 +496,7 @@ raise NoCanonicalUrl(obj, obj) rootsite = obj_urldata.rootsite - # The request is needed when there's no rootsite specified and when - # handling the different shipit sites. + # The request is needed when there's no rootsite specified. if request is None: # Look for a request from the interaction. current_request = get_current_browser_request() === modified file 'lib/canonical/launchpad/webapp/tests/test_session.py' --- lib/canonical/launchpad/webapp/tests/test_session.py 2010-02-16 14:25:51 +0000 +++ lib/canonical/launchpad/webapp/tests/test_session.py 2011-04-21 05:41:09 +0000 @@ -18,12 +18,9 @@ self.assertEqual(get_cookie_domain('bugs.launchpad.net'), '.launchpad.net') - def test_shipit_domain(self): - # The shipit domains are outside of the Launchpad tree, so do - # not return a cookie domain. - self.assertEqual(get_cookie_domain('shipit.ubuntu.com'), None) - self.assertEqual(get_cookie_domain('shipit.kubuntu.org'), None) - self.assertEqual(get_cookie_domain('shipit.edubuntu.org'), None) + def test_other_domain(self): + # Other domains do not return a cookie domain. + self.assertEqual(get_cookie_domain('example.com'), None) def test_other_instances(self): # Test that requests to other launchpad instances are scoped right === modified file 'lib/canonical/launchpad/zcml/launchpad.zcml' --- lib/canonical/launchpad/zcml/launchpad.zcml 2011-03-01 15:03:44 +0000 +++ lib/canonical/launchpad/zcml/launchpad.zcml 2011-04-21 05:41:09 +0000 @@ -166,8 +166,8 @@ permission="zope.Public" /> - <!-- Macros for the forbidden pages; used by launchpad-forbidden.pt and - shipit-forbidden.pt, initially. --> + <!-- Macros for the forbidden pages; used by launchpad-forbidden.pt, + initially. --> <browser:page for="*" name="+forbidden-page-macros" === modified file 'lib/devscripts/ec2test/instance.py' --- lib/devscripts/ec2test/instance.py 2011-03-31 12:33:55 +0000 +++ lib/devscripts/ec2test/instance.py 2011-04-21 05:41:09 +0000 @@ -110,9 +110,6 @@ openid.launchpad.dev ppa.launchpad.dev private-ppa.launchpad.dev - shipit.edubuntu.dev - shipit.kubuntu.dev - shipit.ubuntu.dev testopenid.dev translations.launchpad.dev xmlrpc-private.launchpad.dev === modified file 'lib/devscripts/ec2test/testrunner.py' --- lib/devscripts/ec2test/testrunner.py 2010-08-18 17:40:29 +0000 +++ lib/devscripts/ec2test/testrunner.py 2011-04-21 05:41:09 +0000 @@ -377,17 +377,8 @@ # Get any new sourcecode branches as requested for dest, src in self.branches: fulldest = os.path.join('/var/launchpad/test/sourcecode', dest) - # Most sourcecode branches share no history with Launchpad and - # might be in different formats so we "branch --standalone" them - # to avoid terribly slow on-the-fly conversions. However, neither - # thing is true of canonical-identity or shipit, so we let them - # use the Launchpad repository. - if dest in ('canonical-identity-provider', 'shipit'): - standalone = '' - else: - standalone = '--standalone' user_connection.run_with_ssh_agent( - 'bzr branch %s %s %s' % (standalone, src, fulldest)) + 'bzr branch --standalone %s %s' % (src, fulldest)) # prepare fresh copy of sourcecode and buildout sources for building p = user_connection.perform p('rm -rf /var/launchpad/tmp') === modified file 'lib/lp/answers/doc/workflow.txt' --- lib/lp/answers/doc/workflow.txt 2010-10-18 22:24:59 +0000 +++ lib/lp/answers/doc/workflow.txt 2011-04-21 05:41:09 +0000 @@ -423,7 +423,7 @@ >>> login(marilize.preferredemail.email) >>> spam_question.reject( - ... marilize, 'Use https://shipit.launchpad.net/ to order CD') + ... marilize, "We don't send free CDs any more.") Traceback (most recent call last): ... Unauthorized: ... @@ -432,7 +432,7 @@ >>> login('[email protected]') >>> reject_message = spam_question.reject( - ... sample_person, 'Use https://shipit.launchpad.net/ to order CD', + ... sample_person, "We don't send free CDs any more.", ... datecreated=now_plus_one_hour) >>> print reject_message.action.name REJECT === modified file 'lib/lp/app/tests/test_tales.py' --- lib/lp/app/tests/test_tales.py 2011-02-21 23:11:17 +0000 +++ lib/lp/app/tests/test_tales.py 2011-04-21 05:41:09 +0000 @@ -82,9 +82,9 @@ ; Path=/; Secure; Domain=.launchpad.net The domain parameter is omitted for domains that appear to be - separate from a Launchpad instance, such as shipit: + separate from a Launchpad instance: - >>> print cookie_scope('https://shipit.ubuntu.com/') + >>> print cookie_scope('https://example.com/') ; Path=/; Secure """ === modified file 'lib/lp/scripts/utilities/importfascist.py' --- lib/lp/scripts/utilities/importfascist.py 2010-10-14 22:31:11 +0000 +++ lib/lp/scripts/utilities/importfascist.py 2011-04-21 05:41:09 +0000 @@ -41,7 +41,6 @@ canonical.librarian.client canonical.librarian.db doctest - lp.shipit """) === removed file 'lib/lp/shipit.py' --- lib/lp/shipit.py 2011-02-24 15:30:54 +0000 +++ lib/lp/shipit.py 1970-01-01 00:00:00 +0000 @@ -1,156 +0,0 @@ -from canonical.config import config -from canonical.database.constants import UTC_NOW -from canonical.database.datetimecol import UtcDateTimeCol -from canonical.database.enumcol import EnumCol -from canonical.database.sqlbase import ( - block_implicit_flushes, - cursor, - flush_database_caches, - flush_database_updates, - ISOLATION_LEVEL_READ_COMMITTED, - quote, - quote_like, - SQLBase, - sqlvalues, - ) -from canonical.launchpad import _ -# From browser/configure.zcml. -from canonical.launchpad.browser import MaintenanceMessage -# From browser/configure.zcml. -from canonical.launchpad.browser.launchpad import LaunchpadImageFolder -from canonical.launchpad.database.account import Account -from canonical.launchpad.datetimeutils import make_mondays_between -from canonical.launchpad.ftests import ( - ANONYMOUS, - login, - ) -from canonical.launchpad.helpers import ( - intOrZero, - shortlist, - ) -from canonical.launchpad.interfaces.account import ( - AccountStatus, - IAccount, - IAccountSet, - ) -from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus -from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities -from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet -# From browser/configure.zcml. -from canonical.launchpad.interfaces.lpstorm import ( - IMasterObject, - ISlaveStore, - IStore, - ) -from canonical.launchpad.interfaces.openidconsumer import IOpenIDConsumerStore -from canonical.launchpad.layers import setFirstLayer -from canonical.launchpad.security import AuthorizationBase -from canonical.launchpad.testing.browser import ( - Browser, - setUp, - tearDown, - ) -from canonical.launchpad.testing.pages import ( - extract_text, - find_tags_by_class, - PageTestSuite, - setUpGlobs, - ) -from canonical.launchpad.testing.systemdocs import ( - LayeredDocFileSuite, - setUp as sd_setUp, - tearDown as sd_tearDown, - ) -from canonical.launchpad.webapp import ( - canonical_url, - Navigation, - redirection, - stepto, - urlappend, - ) -from canonical.launchpad.webapp.batching import BatchNavigator -from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy -from canonical.launchpad.webapp.error import SystemErrorView -from canonical.launchpad.webapp.interaction import Participation -from canonical.launchpad.webapp.interfaces import ( - ILaunchBag, - ILaunchpadApplication, - ILaunchpadRoot, - IPlacelessLoginSource, - IStoreSelector, - UnexpectedFormData, - ) -from canonical.launchpad.webapp.login import ( - allowUnauthenticatedSession, - logInPrincipal, - ) -from canonical.launchpad.webapp.menu import structured -from canonical.launchpad.webapp.publication import LaunchpadBrowserPublication -from canonical.launchpad.webapp.publisher import LaunchpadView -from canonical.launchpad.webapp.servers import ( - AccountPrincipalMixin, - LaunchpadBrowserRequest, - LaunchpadTestRequest, - VirtualHostRequestPublicationFactory, - ) -from canonical.launchpad.webapp.testing import verifyObject -from canonical.launchpad.webapp.tests.test_login import ( - FakeOpenIDConsumer, - FakeOpenIDResponse, - fill_login_form_and_submit, - IAccountSet_getByOpenIDIdentifier_monkey_patched, - SRegResponse_fromSuccessResponse_stubbed, - ) -from canonical.launchpad.webapp.vhosts import allvhosts -from canonical.lazr import ExportedFolder -from canonical.testing.layers import ( - AppServerLayer, - DatabaseFunctionalLayer, - FunctionalLayer, - LaunchpadFunctionalLayer, - LaunchpadLayer, - ) -from lp.app import versioninfo -from lp.app.browser.launchpadform import ( - action, - custom_widget, - LaunchpadEditFormView, - LaunchpadFormView, - ) -from lp.app.validators import LaunchpadValidationError -from lp.app.versioninfo import revno -from lp.app.widgets.itemswidgets import ( - CheckBoxMatrixWidget, - LabeledMultiCheckBoxWidget, - ) -from lp.registry.interfaces.person import ( - IPerson, - IPersonSet, - PersonCreationRationale, - ) -from lp.registry.model.karma import Karma -from lp.registry.model.person import Person -from lp.services.mail import stub -from lp.services.mail.sendmail import simple_sendmail -from lp.services.propertycache import ( - cachedproperty, - get_property_cache, - ) -from lp.services.scripts.base import ( - LaunchpadCronScript, - LaunchpadScript, - LaunchpadScriptFailure, - ) -from lp.services.worlddata.interfaces.country import ICountrySet -from lp.services.worlddata.model.country import Country -from lp.testing import ( - login_person, - logout, - run_script, - TestCase, - TestCaseWithFactory, - ) -from lp.testing.factory import LaunchpadObjectFactory -from lp.testing.publication import get_request_and_publication - - === modified file 'utilities/rocketfuel-setup' --- utilities/rocketfuel-setup 2010-12-11 13:40:51 +0000 +++ utilities/rocketfuel-setup 2011-04-21 05:41:09 +0000 @@ -65,9 +65,6 @@ ubuntu-openid.launchpad.dev ppa.launchpad.dev private-ppa.launchpad.dev - shipit.edubuntu.dev - shipit.kubuntu.dev - shipit.ubuntu.dev testopenid.dev translations.launchpad.dev xmlrpc-private.launchpad.dev
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
