launchpad-reviewers team mailing list archive

[Tim Penhey <tim.penhey@xxxxxxxxxxxxx>]

Tim Penhey has proposed merging lp:~thumper/launchpad/remove-recipe-feature-flag into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~thumper/launchpad/remove-recipe-feature-flag/+merge/57620

Remove the recipe feature flag as we don't need it any more.
-- 
https://code.launchpad.net/~thumper/launchpad/remove-recipe-feature-flag/+merge/57620
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~thumper/launchpad/remove-recipe-feature-flag into lp:launchpad.

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2011-03-23 16:28:51 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2011-04-14 04:47:30 +0000
@@ -102,7 +102,6 @@
     ISourcePackageRecipe,
     ISourcePackageRecipeSource,
     MINIMAL_RECIPE_TEXT,
-    RECIPE_BETA_FLAG,
     )
 from lp.code.model.branchtarget import PersonBranchTarget
 from lp.code.model.sourcepackagerecipe import get_buildable_distroseries_set
@@ -112,14 +111,6 @@
 from lp.soyuz.model.archive import Archive
 
 
-RECIPE_BETA_MESSAGE = structured(
-    'We\'re still working on source package recipes. '
-    'We would love for you to try them out, and if you have '
-    'any issues, please '
-    '<a href="http://bugs.launchpad.net/launchpad";>'
-    'file a bug</a>.  We\'ll be happy to fix any problems you encounter.')
-
-
 class IRecipesForPerson(Interface):
     """A marker interface for source package recipe sets."""
 
@@ -216,8 +207,6 @@
 
     def initialize(self):
         super(SourcePackageRecipeView, self).initialize()
-        if getFeatureFlag(RECIPE_BETA_FLAG):
-            self.request.response.addWarningNotification(RECIPE_BETA_MESSAGE)
         recipe = self.context
         if recipe.build_daily and recipe.daily_build_archive is None:
             self.request.response.addWarningNotification(
@@ -718,8 +707,6 @@
 
     def initialize(self):
         super(SourcePackageRecipeAddView, self).initialize()
-        if getFeatureFlag(RECIPE_BETA_FLAG):
-            self.request.response.addWarningNotification(RECIPE_BETA_MESSAGE)
         widget = self.widgets['use_ppa']
         current_value = widget._getFormValue()
         self.use_ppa_existing = render_radio_widget_part(

=== modified file 'lib/lp/code/browser/sourcepackagerecipelisting.py'
--- lib/lp/code/browser/sourcepackagerecipelisting.py	2011-02-23 01:24:09 +0000
+++ lib/lp/code/browser/sourcepackagerecipelisting.py	2011-04-14 04:47:30 +0000
@@ -19,8 +19,6 @@
     LaunchpadView,
     Link,
     )
-from lp.code.interfaces.sourcepackagerecipe import RECIPE_ENABLED_FLAG
-from lp.services.features import getFeatureFlag
 
 
 class HasRecipesMenuMixin:
@@ -31,8 +29,6 @@
         enabled = False
         if self.context.recipes.count():
             enabled = True
-        if not getFeatureFlag(RECIPE_ENABLED_FLAG):
-            enabled = False
         return Link(
             '+recipes', text, icon='info', enabled=enabled, site='code')
 

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2011-03-23 16:28:51 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2011-04-14 04:47:30 +0000
@@ -49,8 +49,6 @@
     )
 from lp.code.interfaces.sourcepackagerecipe import (
     MINIMAL_RECIPE_TEXT,
-    RECIPE_BETA_FLAG,
-    RECIPE_ENABLED_FLAG,
     )
 from lp.code.tests.helpers import recipe_parser_newest_version
 from lp.registry.interfaces.person import (
@@ -58,7 +56,6 @@
     )
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus
-from lp.services.features.testing import FeatureFixture
 from lp.services.propertycache import clear_property_cache
 from lp.soyuz.model.processor import ProcessorFamily
 from lp.testing import (
@@ -284,13 +281,6 @@
 
     layer = DatabaseFunctionalLayer
 
-    def setUp(self):
-        super(TestSourcePackageRecipeAddView, self).setUp()
-        self.useFixture(
-            FeatureFixture(
-                {RECIPE_ENABLED_FLAG: 'on',
-                 RECIPE_BETA_FLAG: 'true'}))
-
     def makeBranch(self):
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2011-03-23 16:28:51 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2011-04-14 04:47:30 +0000
@@ -14,8 +14,6 @@
     'ISourcePackageRecipeData',
     'ISourcePackageRecipeSource',
     'MINIMAL_RECIPE_TEXT',
-    'RECIPE_BETA_FLAG',
-    'RECIPE_ENABLED_FLAG',
     ]
 
 
@@ -67,9 +65,6 @@
 from lp.soyuz.interfaces.archive import IArchive
 
 
-RECIPE_ENABLED_FLAG = u'code.recipes_enabled'
-RECIPE_BETA_FLAG = u'code.recipes.beta'
-
 MINIMAL_RECIPE_TEXT = dedent(u'''\
     # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
     %s

=== modified file 'lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt'
--- lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2011-02-18 05:40:41 +0000
+++ lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2011-04-14 04:47:30 +0000
@@ -5,10 +5,6 @@
 Pages that want to display lists of recipes use the recipe-listing
 page template, and views derived from RecipeListingView.
 
-    >>> from lp.services.features.testing import FeatureFixture
-    >>> fixture = FeatureFixture(
-    ...     {'code.recipes_enabled': 'on', 'code.recipes.beta': 'true'})
-    >>> fixture.setUp()
     >>> def print_recipe_listing_head(browser):
     ...     table = find_tag_by_id(browser.contents, 'recipetable')
     ...     for row in table.thead.fetch('tr'):
@@ -138,5 +134,3 @@
     generic-string... lp://dev/... ...
     generic-string... lp://dev/... ...
     generic-string... lp://dev/... ...
-
-    >>> fixture.cleanUp()

=== modified file 'lib/lp/code/templates/branch-index.pt'
--- lib/lp/code/templates/branch-index.pt	2011-03-07 01:44:54 +0000
+++ lib/lp/code/templates/branch-index.pt	2011-04-14 04:47:30 +0000
@@ -109,7 +109,6 @@
            replace="structure context/@@++branch-pending-merges" />
       <tal:branch-recipes
            replace="structure context/@@++branch-recipes"
-           condition="request/features/code.recipes_enabled"
       />
       <tal:related-bugs-specs
            replace="structure context/@@++branch-related-bugs-specs" />

=== modified file 'lib/lp/code/templates/branch-recipes.pt'
--- lib/lp/code/templates/branch-recipes.pt	2011-02-17 04:09:05 +0000
+++ lib/lp/code/templates/branch-recipes.pt	2011-04-14 04:47:30 +0000
@@ -25,8 +25,6 @@
       tal:condition="link/enabled"
       tal:replace="structure link/render"
       />
-    <img src="/@@/beta" alt="beta" title="This feature is in beta"
-         tal:condition="request/features/code.recipes.beta"/>
   </div>
 
 </div>

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2011-03-30 11:36:37 +0000
+++ lib/lp/services/features/flags.py	2011-04-14 04:47:30 +0000
@@ -37,14 +37,6 @@
      'boolean',
      'Shows incremental diffs on merge proposals.',
      ''),
-    ('code.recipes_enabled',
-     'boolean',
-     'Enables source package recipes in the API and UI.',
-     ''),
-    ('code.recipes.beta',
-     'boolean',
-     'True if recipes are still in beta',
-     ''),
     ('hard_timeout',
      'float',
      'Sets the hard request timeout in milliseconds.',