Skip to content

Commit

Permalink
[fc] Repository: plone.app.upgrade
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2019-02-19T01:07:27+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: plone/plone.app.upgrade@4869bab

Initiate Upgrade profile for Plone 5.2beta2

Files changed:
M plone/app/upgrade/v52/betas.py
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/profiles.zcml
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2019-02-19T01:08:32+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: plone/plone.app.upgrade@9b89d38

Add new registry/resources upgrade step to update 'moment' resource to use version without locales, which are now lazy loaded

Files changed:
A plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2019-02-19T01:13:01+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: plone/plone.app.upgrade@0332100

Add towncrier entry (changelog)

Files changed:
A news/199.news
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2019-02-20T22:11:13+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.upgrade@fea9f3f

Merge pull request #199 from plone/momentjsLazyLoadLocales

Add profile for Plone 5.2b2; Start with new resources step…

Files changed:
A news/199.news
A plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml
M plone/app/upgrade/v52/betas.py
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/profiles.zcml
  • Loading branch information
@jensens
jensens committed Feb 20, 2019
1 parent ff2d097 commit 02911ea
Showing 1 changed file with 45 additions and 29 deletions.
74 changes: 45 additions & 29 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,68 @@
Repository: Products.CMFPlone
Repository: plone.app.upgrade


Branch: refs/heads/5.1.x
Date: 2019-02-20T10:34:24+01:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/9c2d279b3c0d606171d8b98bd4340c5b701e1339
Branch: refs/heads/master
Date: 2019-02-19T01:07:27+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: https://github.com/plone/plone.app.upgrade/commit/4869bab375c19888e177c9776c647b2933f5a987

Only check once if ATCT is available
Initiate Upgrade profile for Plone 5.2beta2

Otherwise the call to check if the distribution is available is done on every single call to ``getOAI``, which can be potentially hundreds of times per request.

Fixes https://github.com/plone/Products.CMFPlone/issues/2765
Files changed:
M plone/app/upgrade/v52/betas.py
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/profiles.zcml

b'diff --git a/plone/app/upgrade/v52/betas.py b/plone/app/upgrade/v52/betas.py\nindex 925ef0e9..a7ac0210 100644\n--- a/plone/app/upgrade/v52/betas.py\n+++ b/plone/app/upgrade/v52/betas.py\n@@ -101,3 +101,7 @@ def to52beta1(context):\n add_exclude_from_nav_index(context)\n remove_legacy_resource_registries(context)\n remove_interface_indexes_from_relations_catalog()\n+\n+\n+def to52beta2(context):\n+ loadMigrationProfile(context, \'profile-plone.app.upgrade.v52:to52beta2\')\ndiff --git a/plone/app/upgrade/v52/configure.zcml b/plone/app/upgrade/v52/configure.zcml\nindex 09880bfa..befd1a35 100644\n--- a/plone/app/upgrade/v52/configure.zcml\n+++ b/plone/app/upgrade/v52/configure.zcml\n@@ -43,6 +43,11 @@\n handler=".betas.to52beta1"\n />\n \n+ <gs:upgradeStep\n+ title="Run to52beta2 upgrade profile."\n+ description=""\n+ handler=".betas.to52beta2"\n+ />\n </gs:upgradeSteps>\n \n </configure>\ndiff --git a/plone/app/upgrade/v52/profiles.zcml b/plone/app/upgrade/v52/profiles.zcml\nindex 7726c8e2..58e73510 100644\n--- a/plone/app/upgrade/v52/profiles.zcml\n+++ b/plone/app/upgrade/v52/profiles.zcml\n@@ -21,4 +21,12 @@\n provides="Products.GenericSetup.interfaces.EXTENSION"\n />\n \n+ <genericsetup:registerProfile\n+ name="to52beta2"\n+ title="Upgrade profile for Plone 5.2beta1 to Plone 5.2beta2"\n+ description=""\n+ directory="profiles/to_beta2"\n+ for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"\n+ provides="Products.GenericSetup.interfaces.EXTENSION"\n+ />\n </configure>\n'

Repository: plone.app.upgrade


Branch: refs/heads/master
Date: 2019-02-19T01:08:32+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: https://github.com/plone/plone.app.upgrade/commit/9b89d381d46d5d975b7d0c8869018e3dc1a792ee

Add new registry/resources upgrade step to update 'moment' resource to use version without locales, which are now lazy loaded

Files changed:
M Products/CMFPlone/PloneBaseTool.py
A plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml

b"diff --git a/Products/CMFPlone/PloneBaseTool.py b/Products/CMFPlone/PloneBaseTool.py\nindex 63ca0f6bdc..5021f12b5a 100644\n--- a/Products/CMFPlone/PloneBaseTool.py\n+++ b/Products/CMFPlone/PloneBaseTool.py\n@@ -29,7 +29,7 @@ def initializeTFC():\n try:\n pkg_resources.get_distribution('Products.ATContentTypes')\n except pkg_resources.DistributionNotFound:\n- pass\n+ TempFolderClass = False\n else:\n from Products.ATContentTypes.tool.factory import TempFolder\n TempFolderClass = TempFolder\n"
b'diff --git a/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\nnew file mode 100644\nindex 00000000..195076b3\n--- /dev/null\n+++ b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\n@@ -0,0 +1,10 @@\n+<?xml version="1.0"?>\n+<registry>\n+\n+ <records prefix="plone.resources/moment"\n+ interface=\'Products.CMFPlone.interfaces.IResourceRegistry\'>\n+ <value key="js">++plone++static/components/moment/min/moment.min.js</value>\n+ <value key="url">++plone++static/components/moment/locale</value>\n+ </records>\n+\n+</registry>\n'

Repository: Products.CMFPlone
Repository: plone.app.upgrade


Branch: refs/heads/5.1.x
Date: 2019-02-20T10:34:26+01:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/24c600a44f2c64c48686f509fc07c91ab93622cd
Branch: refs/heads/master
Date: 2019-02-19T01:13:01+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: https://github.com/plone/plone.app.upgrade/commit/03321003eb87934dfde156317dbdebf8ab272755

Add news entry
Add towncrier entry (changelog)

Files changed:
A news/2765.bugfix
A news/199.news

b'diff --git a/news/2765.bugfix b/news/2765.bugfix\nnew file mode 100644\nindex 0000000000..614f3c7adb\n--- /dev/null\n+++ b/news/2765.bugfix\n@@ -0,0 +1,2 @@\n+Check only once if Products.ATContentTypes is available.\n+[gforcada]\n'
b'diff --git a/news/199.news b/news/199.news\nnew file mode 100644\nindex 00000000..7aefd132\n--- /dev/null\n+++ b/news/199.news\n@@ -0,0 +1,5 @@\n+Add upgrade profile for Plone 5.2beta2\n+[davilima6]\n+\n+Add upgrade step for loading Moments.js without locales, which are now lazy loaded\n+[davilima6]\n'

Repository: Products.CMFPlone
Repository: plone.app.upgrade


Branch: refs/heads/5.1.x
Date: 2019-02-20T16:34:27+01:00
Author: Alessandro Pisa (ale-rt) <alessandro.pisa@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/ea6f1a32e61e82b091bc9dc5cb620b7bb383f501
Branch: refs/heads/master
Date: 2019-02-20T22:11:13+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.upgrade/commit/fea9f3fc9fb99fcdf2681b734ec11201df08835c

Merge pull request #2768 from plone/backport-gforcada-patch-1
Merge pull request #199 from plone/momentjsLazyLoadLocales

[5.1] Only check once if ATCT is available
Add profile for Plone 5.2b2; Start with new resources step…

Files changed:
A news/2765.bugfix
M Products/CMFPlone/PloneBaseTool.py
A news/199.news
A plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml
M plone/app/upgrade/v52/betas.py
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/profiles.zcml

b"diff --git a/Products/CMFPlone/PloneBaseTool.py b/Products/CMFPlone/PloneBaseTool.py\nindex 63ca0f6bdc..5021f12b5a 100644\n--- a/Products/CMFPlone/PloneBaseTool.py\n+++ b/Products/CMFPlone/PloneBaseTool.py\n@@ -29,7 +29,7 @@ def initializeTFC():\n try:\n pkg_resources.get_distribution('Products.ATContentTypes')\n except pkg_resources.DistributionNotFound:\n- pass\n+ TempFolderClass = False\n else:\n from Products.ATContentTypes.tool.factory import TempFolder\n TempFolderClass = TempFolder\ndiff --git a/news/2765.bugfix b/news/2765.bugfix\nnew file mode 100644\nindex 0000000000..614f3c7adb\n--- /dev/null\n+++ b/news/2765.bugfix\n@@ -0,0 +1,2 @@\n+Check only once if Products.ATContentTypes is available.\n+[gforcada]\n"
b'diff --git a/news/199.news b/news/199.news\nnew file mode 100644\nindex 00000000..7aefd132\n--- /dev/null\n+++ b/news/199.news\n@@ -0,0 +1,5 @@\n+Add upgrade profile for Plone 5.2beta2\n+[davilima6]\n+\n+Add upgrade step for loading Moments.js without locales, which are now lazy loaded\n+[davilima6]\ndiff --git a/plone/app/upgrade/v52/betas.py b/plone/app/upgrade/v52/betas.py\nindex 8ba2c9fc..ad108059 100644\n--- a/plone/app/upgrade/v52/betas.py\n+++ b/plone/app/upgrade/v52/betas.py\n@@ -102,3 +102,7 @@ def to52beta1(context):\n add_exclude_from_nav_index(context)\n remove_legacy_resource_registries(context)\n remove_interface_indexes_from_relations_catalog()\n+\n+\n+def to52beta2(context):\n+ loadMigrationProfile(context, \'profile-plone.app.upgrade.v52:to52beta2\')\ndiff --git a/plone/app/upgrade/v52/configure.zcml b/plone/app/upgrade/v52/configure.zcml\nindex 09880bfa..befd1a35 100644\n--- a/plone/app/upgrade/v52/configure.zcml\n+++ b/plone/app/upgrade/v52/configure.zcml\n@@ -43,6 +43,11 @@\n handler=".betas.to52beta1"\n />\n \n+ <gs:upgradeStep\n+ title="Run to52beta2 upgrade profile."\n+ description=""\n+ handler=".betas.to52beta2"\n+ />\n </gs:upgradeSteps>\n \n </configure>\ndiff --git a/plone/app/upgrade/v52/profiles.zcml b/plone/app/upgrade/v52/profiles.zcml\nindex 7726c8e2..58e73510 100644\n--- a/plone/app/upgrade/v52/profiles.zcml\n+++ b/plone/app/upgrade/v52/profiles.zcml\n@@ -21,4 +21,12 @@\n provides="Products.GenericSetup.interfaces.EXTENSION"\n />\n \n+ <genericsetup:registerProfile\n+ name="to52beta2"\n+ title="Upgrade profile for Plone 5.2beta1 to Plone 5.2beta2"\n+ description=""\n+ directory="profiles/to_beta2"\n+ for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"\n+ provides="Products.GenericSetup.interfaces.EXTENSION"\n+ />\n </configure>\ndiff --git a/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\nnew file mode 100644\nindex 00000000..195076b3\n--- /dev/null\n+++ b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\n@@ -0,0 +1,10 @@\n+<?xml version="1.0"?>\n+<registry>\n+\n+ <records prefix="plone.resources/moment"\n+ interface=\'Products.CMFPlone.interfaces.IResourceRegistry\'>\n+ <value key="js">++plone++static/components/moment/min/moment.min.js</value>\n+ <value key="url">++plone++static/components/moment/locale</value>\n+ </records>\n+\n+</registry>\n'

0 comments on commit 02911ea

Please sign in to comment.