Skip to content

Commit

Permalink
Corrected import step dependencies to avoid unresolved warning.
Browse files Browse the repository at this point in the history
  • Loading branch information
sgeulette committed Oct 11, 2018
1 parent 58a32c8 commit b154bbf
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 12 deletions.
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Changelog
0.15 (unreleased)
-----------------

- Nothing changed yet.

- Corrected import step dependencies to avoid unresolved warning.
[sgeulette]

0.14 (2018-07-23)
-----------------
Expand Down
1 change: 1 addition & 0 deletions src/collective/messagesviewlet/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<i18n:registerTranslations directory="locales" />

<include package=".browser" />
<include package=".upgrades" />

<permission
id="collective.messagesviewlet.addMessage"
Expand Down
13 changes: 9 additions & 4 deletions src/collective/messagesviewlet/profiles/default/import_steps.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
<?xml version="1.0"?>
<import-steps>

<import-step
id="collective-messagesviewlet-post-install"
<import-step
id="collective-messagesviewlet-post-install"
handler="collective.messagesviewlet.setuphandlers.post_install"
title="manual coded post-install for collective.messagesviewlet"
version="2015-08-24">
<dependency step=""/>
<dependency step="browserlayer"/>
<dependency step="controlpanel"/>
<dependency step="cssregistry"/>
<dependency step="propertiestool"/>
<dependency step="rolemap"/>
<dependency step="typeinfo"/>
<dependency step="workflow"/>
manual coded post-install for collective.messagesviewlet
</import-step>

</import-steps>

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<metadata>
<version>1000</version>
<version>1001</version>
<dependencies>
<dependency>profile-plone.app.dexterity:default</dependency>
<dependency>profile-plone.formwidget.datetime:default</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<?xml version="1.0"?>
<import-steps>

<import-step
id="collective-messagesviewlet-messages"
<import-step
id="collective-messagesviewlet-messages"
handler="collective.messagesviewlet.setuphandlers.add_default_messages"
title="default messages for collective.messagesviewlet"
version="2015-09-09">
<dependency step=""/>
default messages for collective.messagesviewlet
</import-step>

</import-steps>

Empty file.
14 changes: 14 additions & 0 deletions src/collective/messagesviewlet/upgrades/configure.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
i18n_domain="collective.messagesviewlet">

<genericsetup:upgradeStep
title="Migration profile for collective.messagesviewlet to 1001"
description="Upgrade from 1000 to 1001"
source="1000"
destination="1001"
handler=".upgrades.v1001"
profile="collective.messagesviewlet:default" />

</configure>
20 changes: 20 additions & 0 deletions src/collective/messagesviewlet/upgrades/upgrades.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
import logging

from plone import api

logger = logging.getLogger('collective.messagesviewlet: upgrade. ')


def v1001(context):
""" Avoid warning about unresolved dependencies """
setup = api.portal.get_tool('portal_setup')
registry = setup.getImportStepRegistry()
config = {'collective-messagesviewlet-post-install': (u'browserlayer', u'controlpanel', u'cssregistry',
u'propertiestool', u'rolemap', u'typeinfo', u'workflow'),
'collective-messagesviewlet-messages': ()}
for key, value in config.items():
step = registry._registered.get(key)
if step is not None:
step['dependencies'] = value
logger.info("Import step dependency corrected")
2 changes: 1 addition & 1 deletion versions.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ipython = 5.7.0

zc.buildout = 2.10.0
setuptools = 18.8
setuptools = 38.2.4

coverage = 3.7.1
createcoverage = 1.4
Expand Down

0 comments on commit b154bbf

Please sign in to comment.