Switch to collective.ftw.upgrade

news/+19978119.internal.rst

@@ -0,0 +1 @@
+Switch to collective.ftw.upgrade

requirements-6.1.txt

@@ -1 +1 @@
--r https://dist.plone.org/release/6.1-latest/requirements.txt
+-r https://dist.plone.org/release/6.2-latest/requirements.txt

setup.py

@@ -39,7 +39,7 @@
         "anytree",
         "Chameleon",
         "decorator",
-        "ftw.upgrade",
+        "collective.ftw.upgrade",
         "lxml",
         "markdownify",
         "nltk",

src/euphorie/client/profiles/default/metadata.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
   <!-- There is no version element in this file because the version is managed by
-    ftw.upgrade in the package euphorie.upgrade
+    collective.ftw.upgrade in the package euphorie.upgrade
   -->
   <dependencies>
     <dependency>profile-euphorie.content:default</dependency>
-    <dependency>profile-ftw.upgrade:default</dependency>
+    <dependency>profile-collective.ftw.upgrade:default</dependency>
   </dependencies>
 </metadata>

src/euphorie/content/configure.zcml

@@ -7,7 +7,7 @@
     i18n_domain="untranslated"
     >
 
-  <include package="ftw.upgrade" />
+  <include package="collective.ftw.upgrade" />
   <include package="plone.app.z3cform" />
   <include package="plone.namedfile" />
   <include package="plone.formwidget.namedfile" />

src/euphorie/content/profiles/default/metadata.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
   <!-- There is no version element in this file because the version is managed by
-    ftw.upgrade in the package euphorie.upgrade
+    collective.ftw.upgrade in the package euphorie.upgrade
   -->
   <dependencies>
     <dependency>profile-Products.membrane:default</dependency>
-    <dependency>profile-ftw.upgrade:default</dependency>
+    <dependency>profile-collective.ftw.upgrade:default</dependency>
   </dependencies>
 </metadata>

src/euphorie/deployment/profiles/default/metadata.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
   <!-- There is no version element in this file because the version is managed by
-    ftw.upgrade in the package euphorie.upgrade
+    collective.ftw.upgrade in the package euphorie.upgrade
   -->
   <dependencies>
     <dependency>profile-plone.app.imagecropping:default</dependency>
     <dependency>profile-plonetheme.nuplone:default</dependency>
     <dependency>profile-euphorie.content:default</dependency>
     <dependency>profile-euphorie.client:default</dependency>
-    <dependency>profile-ftw.upgrade:default</dependency>
+    <dependency>profile-collective.ftw.upgrade:default</dependency>
   </dependencies>
 </metadata>

src/euphorie/upgrade/client/configure.zcml

@@ -1,16 +1,16 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:upgrade-step="http://namespaces.zope.org/ftw.upgrade"
+    xmlns:upgrade-step="http://namespaces.zope.org/collective.ftw.upgrade"
     >
 
   <include
-      package="ftw.upgrade"
+      package="collective.ftw.upgrade"
       file="meta.zcml"
       />
 
   <upgrade-step:directory
-      profile="euphorie.client:default"
       directory="v1"
+      profile="euphorie.client:default"
       />
 
 </configure>

src/euphorie/upgrade/content/configure.zcml

@@ -1,16 +1,16 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:upgrade-step="http://namespaces.zope.org/ftw.upgrade"
+    xmlns:upgrade-step="http://namespaces.zope.org/collective.ftw.upgrade"
     >
 
   <include
-      package="ftw.upgrade"
+      package="collective.ftw.upgrade"
       file="meta.zcml"
       />
 
   <upgrade-step:directory
-      profile="euphorie.content:default"
       directory="v1"
+      profile="euphorie.content:default"
       />
 
 </configure>

src/euphorie/upgrade/content/v1/20201203144920_added_a_browser_layer_for_euphorie_content/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class AddedABrowserLayerForEuphorieContent(UpgradeStep):

src/euphorie/upgrade/content/v1/20201219143658_reimport_surveygroup/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone import api
 
 

src/euphorie/upgrade/content/v1/20210730081303_add_lead_image_behavior_to_survey/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class AddLeadImageBehaviorToSurvey(UpgradeStep):

src/euphorie/upgrade/deployment/configure.zcml

@@ -1,26 +1,26 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:upgrade-step="http://namespaces.zope.org/ftw.upgrade"
+    xmlns:upgrade-step="http://namespaces.zope.org/collective.ftw.upgrade"
     >
 
   <include
-      package="ftw.upgrade"
+      package="collective.ftw.upgrade"
       file="meta.zcml"
       />
 
   <upgrade-step:directory
-      profile="euphorie.deployment:default"
       directory="v1"
+      profile="euphorie.deployment:default"
       />
 
   <upgrade-step:directory
-      profile="euphorie.deployment:default"
       directory="v18"
+      profile="euphorie.deployment:default"
       />
 
   <upgrade-step:directory
-      profile="euphorie.deployment:default"
       directory="v19"
+      profile="euphorie.deployment:default"
       />
 
 </configure>

src/euphorie/upgrade/deployment/v1/10000000000000_install_ftw_upgrade/__init__.py

@@ -1,8 +1,8 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class InstallFtwUpgrade(UpgradeStep):
-    """Install ftw.upgrade."""
+    """Install collective.ftw.upgrade."""
 
     def __call__(self):
-        self.ensure_profile_installed("ftw.upgrade:default")
+        self.ensure_profile_installed("collective.ftw.upgrade:default")

src/euphorie/upgrade/deployment/v1/20211216172426_toggle_for_self_registration/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class ToggleForSelfRegistration(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20220318135716_add_training_question/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AddTrainingQuestion(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20220620103222_add_first_and_last_name_to_user/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AddFirstAndLastNameToUser(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20220622072638_set_password_expiration_timeout/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone import api
 
 

src/euphorie/upgrade/deployment/v1/20220705145832_remove_the_completion_percentage_column/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class RemoveTheCompletionPercentageColumn(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20220706144723_activate_secure_session_cookie/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.setuphandlers import setupSecureSessionCookie
-from ftw.upgrade import UpgradeStep
 from plone import api
 
 

src/euphorie/upgrade/deployment/v1/20220720110538_upgrade_to_alembic_head/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade
-from ftw.upgrade import UpgradeStep
 
 
 class UpgradeToAlembicHead(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20220729163542_decommission_the_training_notes_field/upgrade.py

@@ -1,6 +1,6 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.client.model import Risk
 from euphorie.client.model import Session
-from ftw.upgrade import UpgradeStep
 from logging import getLogger
 
 import sqlalchemy as sa

src/euphorie/upgrade/deployment/v1/20220805134335_make__keep_me_logged_in__checkbox_optional/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class Make_KeepMeLoggedIn_checkboxOptional(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230406070728_add_session_redirect/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AddSessionRedirect(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230421104953_add_use_consultancy_phase_feature_switch/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class AddUseConsultancyPhaseFeatureSwitch(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230421141443_add_consultancy_table/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AddConsultancyTable(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230502091628_upgrade_consultancy_table/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class UpgradeConsultancyTable(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230504061955_add_session_event_table/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AddSessionEventTable(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230515143459_allow_consultant_deletion/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AllowConsultantDeletion(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230525151837_add_the_locking_feature/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone import api
 
 

src/euphorie/upgrade/deployment/v1/20230530084552_set_the_published_sessions_to_locked/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.client import model
-from ftw.upgrade import UpgradeStep
 
 
 class SetThePublishedSessionsToLocked(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20230606094424_remove_use_consultancy_phase_feature_switch/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class RemoveUseConsultancyPhaseFeatureSwitch(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20231019121221_add_notification_tables/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AddNotificationTables(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20231128125729_notifications_registry_entries/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class NotificationsRegistryEntries(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20231221095252_remove_wkhtmltopdf_settings/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone.registry.interfaces import IRegistry
 from zope.component import getUtility
 

src/euphorie/upgrade/deployment/v1/20240419142030_add_the_scaled_answer_column/upgrade.py

@@ -1,5 +1,5 @@
+from collective.ftw.upgrade import UpgradeStep
 from euphorie.deployment.upgrade.utils import alembic_upgrade_to
-from ftw.upgrade import UpgradeStep
 
 
 class AddTheScaledAnswerColumn(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20240426095318_notifications_allow_user_settings/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class NotificationsAllowUserSettings(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20241127135848_fix_navigation_in_cms/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class FixNavigationInCMS(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20250327125832_install_the_maintenance_actions/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class InstallTheMaintenanceActions(UpgradeStep):

src/euphorie/upgrade/deployment/v1/20250516152600_hide_external_editor_action/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class HideExternalEditorAction(UpgradeStep):

src/euphorie/upgrade/deployment/v18/20250521110138_fix_default_language/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone import api
 
 

src/euphorie/upgrade/deployment/v19/20250905174600_remove_use_clone_feature_registry_record/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 
 
 class RemoveCloneFeatureFlag(UpgradeStep):

src/euphorie/upgrade/deployment/v19/20250924170243_set_the_new_field_enable_test_questions/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone import api
 
 

src/euphorie/upgrade/deployment/v19/20251006201600_ensure_uid/upgrade.py

@@ -1,5 +1,5 @@
 from Acquisition import aq_base
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone import api
 from plone.uuid.interfaces import ATTRIBUTE_NAME
 from plone.uuid.interfaces import IUUIDGenerator

src/euphorie/upgrade/deployment/v19/20251010123200_fix_uid_index/upgrade.py

@@ -1,4 +1,4 @@
-from ftw.upgrade import UpgradeStep
+from collective.ftw.upgrade import UpgradeStep
 from plone import api
 from plone.app.upgrade.utils import update_catalog_metadata
 from plone.uuid.handlers import addAttributeUUID

versions-common.cfg

@@ -1,11 +1,15 @@
 [versions]
 NuPlone = 5.0.0
 
+# For the build tools we rely on the one installed via requirements.txt
+setuptools =
+zc.buildout =
 
 alembic = 1.15.1
 anytree = 2.12.1
 argcomplete = 3.6.0
 Brotli = 1.1.0
+collective.ftw.upgrade = 4.0.0a5
 cssselect2 = 0.8.0
 cssutils = 2.11.1
 et-xmlfile = 2.0.0
@@ -52,13 +56,3 @@ z3c.ptcompat = 5.0
 z3c.saconfig = 2.0
 zope.sqlalchemy = 3.1
 zopfli = 0.2.3.post1
-
-# This is necessary to have some ftw.upgrade working with latest Plone, see:
-#
-# - https://github.com/4teamwork/ftw.upgrade/pull/232
-[buildout]
-find-links +=
-    https://pypi.syslab.com/packages
-
-[versions]
-ftw.upgrade = 3.4.0a3+slc0