Add upgrade step for changes in 2.1

CHANGES.rst

@@ -1,10 +1,11 @@
 Changelog
 =========
 
-2.2 (unreleased)
-----------------
+2.1.1 (unreleased)
+------------------
 
-- Nothing changed yet.
+- Add upgrade step for changes in 2.1 + register missing upgrade steps for Plone 5 migration.
+  [thet]
 
 
 2.1 (2017-02-28)

plone/formwidget/geolocation/configure.zcml

@@ -56,7 +56,15 @@
       description="Migrate resources to new resource registry."
       source="1"
       destination="2"
-      handler="plone.formwidget.geolocation.upgrade_1_to_2"
+      handler="plone.formwidget.geolocation.upgrades.upgrade_1_to_2"
+      profile="plone.formwidget.geolocation:default"
+      />
+  <genericsetup:upgradeStep
+      title="Remove unused resources"
+      description="Remove unused bundles and resources, which are now provided by plone.patternslib."
+      source="2"
+      destination="3"
+      handler="plone.formwidget.geolocation.upgrades.upgrade_2_to_3"
       profile="plone.formwidget.geolocation:default"
       />
 

plone/formwidget/geolocation/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2</version>
+  <version>3</version>
   <dependencies>
     <dependency>profile-plone.patternslib:default</dependency>
   </dependencies>

plone/formwidget/geolocation/upgrades.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
+from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.interfaces import IResourceRegistry
+from zope.component import getUtility
+
 import logging
 
 
@@ -41,3 +45,28 @@ def upgrade_1_to_2(context):
 
     setup = getToolByName(context, 'portal_setup')
     setup.runImportStepFromProfile(PROFILE_ID, 'plone.app.registry')
+
+
+def upgrade_2_to_3(context):
+    """Remove unused bundles and resources.
+    """
+
+    registry = getUtility(IRegistry)
+    records = registry.collectionOfInterface(
+        IResourceRegistry,
+        prefix='plone.resources',
+        check=False
+    )
+    if 'geolocation-bundle-resource' in records:
+        del records['geolocation-bundle-resource']
+
+    records = registry.collectionOfInterface(
+        IResourceRegistry,
+        prefix='plone.bundles',
+        check=False
+    )
+    if 'geolocation-bundle' in records:
+        del records['geolocation-bundle']
+
+    setup = getToolByName(context, 'portal_setup')
+    setup.runAllImportStepsFromProfile('profile-plone.patternslib:default')

setup.py

@@ -2,7 +2,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.2.dev0'
+version = '2.1.1'
 
 setup(
     name='plone.formwidget.geolocation',