Merge 0b86c37 into eac846c

CHANGES.rst

@@ -10,6 +10,12 @@ Changelog
 - Disable extra requirements for theme addon
   [balavec]
 
+- Fix upgrade_step template, missing bob-file-extension and import
+  [MrTango]
+
+- Fix upgrade_step by add missing directory attribute to UpgradeStep profile, upgrade_steps are no longer visible in addon control panel
+  [MrTango]
+
 
 5.0.3 (2019-10-24)
 ------------------

bobtemplates/plone/addon/base.cfg.bob

@@ -33,7 +33,7 @@ eggs =
 
 
 [code-analysis]
-recipe = plone.recipe.codeanalysis[recommended]
+recipe = plone.recipe.codeanalysis
 directory = ${buildout:directory}/src/{{{ package.namespace }}}
 return-status-codes = False
 

bobtemplates/plone/addon/test_plone43.cfg

@@ -13,6 +13,9 @@ setuptools = 27.3.0
 # Pillow = 5.1.0
 
 # manual pinnings
+plone.recipe.codeanalysis = 3.0.1
+backports.functools_lru_cache = 1.5
+isort = 4.3.21
 # 2.1.1 is the last supported version for Plone 4.3, but plone.app.contenttypes 1.1.6 is requirering <2.1.0:
 plone.app.dexterity = <2.1.0
 docutils = 0.14

bobtemplates/plone/upgrade_step/tests/test_upgrade_step_+upgrade_step_id+.py.bob

@@ -15,11 +15,15 @@ class UpgradeStepIntegrationTest(unittest.TestCase):
         self.portal = self.layer['portal']
         setRoles(self.portal, TEST_USER_ID, ['Manager'])
 
-
-class UpgradeStepFunctionalTest(unittest.TestCase):
-
-    layer = {{{package.uppercasename}}}_FUNCTIONAL_TESTING
-
-    def setUp(self):
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
+    def test_upgrade_step(self):
+        # dummy, add tests here
+        self.assertTrue(True)
+
+
+# class UpgradeStepFunctionalTest(unittest.TestCase):
+#
+#     layer = {{{package.uppercasename}}}_FUNCTIONAL_TESTING
+#
+#     def setUp(self):
+#         self.portal = self.layer['portal']
+#         setRoles(self.portal, TEST_USER_ID, ['Manager'])

bobtemplates/plone/upgrade_step/upgrades/+upgrade_step_id+.zcml.bob

@@ -3,6 +3,7 @@
 
   <gs:registerProfile name="{{{ upgrade_step_dest_version }}}"
     title="{{{ upgrade_step_title }}}"
+    directory="{{{ upgrade_step_dest_version }}}"
     description='Configuration for version {{{ upgrade_step_dest_version }}}'
     for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
     provides="Products.GenericSetup.interfaces.EXTENSION" />

bobtemplates/plone/upgrade_step/upgrades/__init__.py.bob

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*
+
+import logging
+
+
+logger = logging.getLogger("{{{ package.dottedname }}}")

bobtemplates/plone/upgrade_step/upgrades/v+upgrade_step_id+.py.bob

@@ -3,6 +3,10 @@
 from . import logger
 
 
+# from base import reload_gs_profile
+# from plone import api
+
+
 def upgrade(setup_tool=None):
     """
     """

tox.ini

@@ -48,15 +48,17 @@ commands =
     mkdir -p {toxinidir}/_build/reports/coverage {toxinidir}/_build/reports/pytest
     packagetests: pytest --cov=bobtemplates.plone --cov-report=xml --html={toxinidir}/_build/reports/pytest/report-{envname}.html --self-contained-html package_tests {posargs}
     template-addon: pytest skeleton-tests/test_addon.py {posargs}
+    template-addon_behavior: pytest skeleton-tests/test_addon_behavior.py {posargs}
     template-addon_content_type: pytest skeleton-tests/test_addon_content_type.py {posargs}
-    template-addon_view: pytest skeleton-tests/test_addon_view.py {posargs}
-    template-addon_viewlet: pytest skeleton-tests/test_addon_viewlet.py {posargs}
+    template-addon_indexer: pytest skeleton-tests/test_addon_indexer.py {posargs}
     template-addon_portlet: pytest skeleton-tests/test_addon_portlet.py {posargs}
+    template-addon_restapi_service: pytest skeleton-tests/test_addon_restapi_service.py {posargs}
     template-addon_theme: pytest skeleton-tests/test_addon_theme.py {posargs}
     template-addon_theme_barceoneta: pytest skeleton-tests/test_addon_theme_barceloneta.py {posargs}
+    template-addon_upgrade_step: pytest skeleton-tests/test_addon_upgrade_step.py {posargs}
+    template-addon_view: pytest skeleton-tests/test_addon_view.py {posargs}
+    template-addon_viewlet: pytest skeleton-tests/test_addon_viewlet.py {posargs}
     template-addon_vocabulary: pytest skeleton-tests/test_addon_vocabulary.py {posargs}
-    template-addon_behavior: pytest skeleton-tests/test_addon_behavior.py {posargs}
-    template-addon_restapi_service: pytest skeleton-tests/test_addon_restapi_service.py {posargs}
     template-theme_package: pytest skeleton-tests/test_theme_package.py {posargs}
 
 setenv =