-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2018-11-11T11:58:38+01:00 Author: Gil Forcada (gforcada) <gil.gnome@gmail.com> Commit: plone/plone.cachepurging@702399d Remove five.globalrequest It has been merged to Zope 4. Files changed: M CHANGES.rst M plone/cachepurging/configure.zcml M setup.py Repository: plone.cachepurging Branch: refs/heads/master Date: 2018-11-13T21:58:32+01:00 Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> Commit: plone/plone.cachepurging@6780fc7 Remove Plone 5.1 trove classifier As the five.globalrequest makes it only compatible with Plone 5.2 (and actually Zope 4). Files changed: M setup.py Repository: plone.cachepurging Branch: refs/heads/master Date: 2018-11-13T21:59:07+01:00 Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> Commit: plone/plone.cachepurging@58c0ade Merge pull request #18 from plone/remove-five-globalrequest Remove five.globalrequest Files changed: M CHANGES.rst M plone/cachepurging/configure.zcml M setup.py
- Loading branch information
Showing
1 changed file
with
30 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,55 @@ | ||
Repository: plone.protect | ||
Repository: plone.cachepurging | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2018-11-11T11:37:55+01:00 | ||
Date: 2018-11-11T11:58:38+01:00 | ||
Author: Gil Forcada (gforcada) <gil.gnome@gmail.com> | ||
Commit: https://github.com/plone/plone.protect/commit/0655c601f816131a7449d8a6dbce776d8b8aa4ad | ||
Commit: https://github.com/plone/plone.cachepurging/commit/702399da2a0716b4fee102286a31e1870a2c1e56 | ||
|
||
Remove five.globalrequest | ||
|
||
It has been merged into Zope 4 itself. | ||
It has been merged to Zope 4. | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M plone/protect/configure.zcml | ||
M plone/cachepurging/configure.zcml | ||
M setup.py | ||
|
||
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 1688893..21b383b 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -6,7 +6,9 @@ Changelog\n \n Breaking changes:\n \n-- *add item here*\n+- Remove five.globalrequest dependency.\n+ It has been deprecated upstream (Zope 4).\n+ [gforcada]\n \n New features:\n \ndiff --git a/plone/protect/configure.zcml b/plone/protect/configure.zcml\nindex 25acd7d..95ae8d3 100644\n--- a/plone/protect/configure.zcml\n+++ b/plone/protect/configure.zcml\n@@ -10,7 +10,6 @@\n zcml:condition="installed AccessControl.rolemanager" />\n <include package="plone.keyring" />\n <include package="plone.transformchain" />\n- <include package="five.globalrequest" />\n \n <browser:page\n for="*"\ndiff --git a/setup.py b/setup.py\nindex 0316581..9b6366b 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -44,7 +44,6 @@\n \'Zope2\',\n \'plone.transformchain\',\n \'repoze.xmliter>=0.3\',\n- \'five.globalrequest\',\n \'collective.monkeypatcher\'\n ],\n extras_require={\n' | ||
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 03e9b2a..85bd801 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -6,7 +6,9 @@ Changelog\n \n Breaking changes:\n \n-- *add item here*\n+- Remove five.globalrequest dependency.\n+ It has been deprecated upstream (Zope 4).\n+ [gforcada]\n \n New features:\n \ndiff --git a/plone/cachepurging/configure.zcml b/plone/cachepurging/configure.zcml\nindex cc480d0..a692fd0 100644\n--- a/plone/cachepurging/configure.zcml\n+++ b/plone/cachepurging/configure.zcml\n@@ -4,7 +4,6 @@\n i18n_domain="plone">\n \n <include package="zope.annotation" />\n- <include package="five.globalrequest" />\n <include package="plone.registry" />\n \n <!-- Default rewriter and purge urls -->\ndiff --git a/setup.py b/setup.py\nindex b9564ce..c9f1800 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -30,7 +30,6 @@\n zip_safe=False,\n install_requires=[\n "setuptools",\n- "five.globalrequest",\n "plone.registry",\n "requests",\n "six",\n' | ||
|
||
Repository: plone.protect | ||
Repository: plone.cachepurging | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2018-11-13T21:19:31+01:00 | ||
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
Commit: https://github.com/plone/plone.protect/commit/11bd30d60203e803edff4d8cc7aa56222826fad0 | ||
Date: 2018-11-13T21:58:32+01:00 | ||
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> | ||
Commit: https://github.com/plone/plone.cachepurging/commit/6780fc7f6cf974e2cc1a67e6a126cf583ac339c7 | ||
|
||
Merge pull request #86 from plone/remove-five-globalrequest | ||
Remove Plone 5.1 trove classifier | ||
|
||
As the five.globalrequest makes it only compatible with Plone 5.2 (and actually Zope 4). | ||
|
||
Files changed: | ||
M setup.py | ||
|
||
b'diff --git a/setup.py b/setup.py\nindex c9f1800..b866cc2 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,6 @@\n ),\n classifiers=[\n "Framework :: Plone",\n- "Framework :: Plone :: 5.1",\n "Framework :: Plone :: 5.2",\n "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",\n "Programming Language :: Python",\n' | ||
|
||
Repository: plone.cachepurging | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2018-11-13T21:59:07+01:00 | ||
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> | ||
Commit: https://github.com/plone/plone.cachepurging/commit/58c0ade79859b74ba774c90b4607ebf9c797ff61 | ||
|
||
Merge pull request #18 from plone/remove-five-globalrequest | ||
|
||
Remove five.globalrequest | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M plone/protect/configure.zcml | ||
M plone/cachepurging/configure.zcml | ||
M setup.py | ||
|
||
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 1688893..21b383b 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -6,7 +6,9 @@ Changelog\n \n Breaking changes:\n \n-- *add item here*\n+- Remove five.globalrequest dependency.\n+ It has been deprecated upstream (Zope 4).\n+ [gforcada]\n \n New features:\n \ndiff --git a/plone/protect/configure.zcml b/plone/protect/configure.zcml\nindex 25acd7d..95ae8d3 100644\n--- a/plone/protect/configure.zcml\n+++ b/plone/protect/configure.zcml\n@@ -10,7 +10,6 @@\n zcml:condition="installed AccessControl.rolemanager" />\n <include package="plone.keyring" />\n <include package="plone.transformchain" />\n- <include package="five.globalrequest" />\n \n <browser:page\n for="*"\ndiff --git a/setup.py b/setup.py\nindex 0316581..9b6366b 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -44,7 +44,6 @@\n \'Zope2\',\n \'plone.transformchain\',\n \'repoze.xmliter>=0.3\',\n- \'five.globalrequest\',\n \'collective.monkeypatcher\'\n ],\n extras_require={\n' | ||
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 03e9b2a..85bd801 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -6,7 +6,9 @@ Changelog\n \n Breaking changes:\n \n-- *add item here*\n+- Remove five.globalrequest dependency.\n+ It has been deprecated upstream (Zope 4).\n+ [gforcada]\n \n New features:\n \ndiff --git a/plone/cachepurging/configure.zcml b/plone/cachepurging/configure.zcml\nindex cc480d0..a692fd0 100644\n--- a/plone/cachepurging/configure.zcml\n+++ b/plone/cachepurging/configure.zcml\n@@ -4,7 +4,6 @@\n i18n_domain="plone">\n \n <include package="zope.annotation" />\n- <include package="five.globalrequest" />\n <include package="plone.registry" />\n \n <!-- Default rewriter and purge urls -->\ndiff --git a/setup.py b/setup.py\nindex b9564ce..b866cc2 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,6 @@\n ),\n classifiers=[\n "Framework :: Plone",\n- "Framework :: Plone :: 5.1",\n "Framework :: Plone :: 5.2",\n "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",\n "Programming Language :: Python",\n@@ -30,7 +29,6 @@\n zip_safe=False,\n install_requires=[\n "setuptools",\n- "five.globalrequest",\n "plone.registry",\n "requests",\n "six",\n' | ||
|