Skip to content

Commit

Permalink
[fc] Repository: plone.app.controlpanel
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2015-06-02T12:00:21+02:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: plone/plone.app.controlpanel@d3fd18f

Remove zope.cachedescriptors dependency.

Files changed:
M setup.py
Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2015-06-02T18:28:29+02:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: plone/plone.app.controlpanel@6273664

Merge pull request #60 from plone/tisto-cleanup-10

Remove zope.cachedescriptors dependency.

Files changed:
M setup.py
  • Loading branch information
tisto committed Jun 2, 2015
1 parent dda0de2 commit 7673f90
Showing 1 changed file with 46 additions and 45 deletions.
91 changes: 46 additions & 45 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
Repository: plone.portlet.collection
Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2015-06-02T09:57:59-05:00
Author: vangheem (vangheem) <vangheem@gmail.com>
Commit: https://github.com/plone/plone.portlet.collection/commit/28c17d2ad3f2b0ce4b0c0fff7a8dae668dbd0c9f
Date: 2015-06-02T12:00:21+02:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/d3fd18fc4525635f012e8098acb19b42952fc7f2

fix test to be more forgiving on matches html
Remove zope.cachedescriptors dependency.

Files changed:
M plone/portlet/collection/tests/functional.txt

diff --git a/plone/portlet/collection/tests/functional.txt b/plone/portlet/collection/tests/functional.txt
index a1b2d17..01f3708 100644
--- a/plone/portlet/collection/tests/functional.txt
+++ b/plone/portlet/collection/tests/functional.txt
@@ -80,26 +80,28 @@ Go to the home page and see if the portlet looks OK.
... return '\n'.join(lines)
>>> print strip_white_space(portlet_contents)
<section class="portlet portletCollection portlet-collection-test-collection"><header class="portletHeader">
- <span class="portletTopLeft"></span>
+ <span class="portletTopLeft"...
<a href="http://nohost/plone/test-collection">
<span>Test Collection</span>
</a>
- <span class="portletTopRight"></span>
+ <span class="portletTopRight"...
</header>
+ <ul class="portletContent">
<li class="portletItem odd">
<a href="http://nohost/plone/test-document" class="tile contenttype-document" title="">
Test Document
</a>
</li>
+ </ul>
<footer class="portletFooter">
- <span class="portletBottomLeft"></span>
+ <span class="portletBottomLeft"...
<span>
<a href="http://nohost/plone/test-collection">
<span class="hiddenStructure">Test Collection - </span>
- <span>More...</span>
+ <span>More...
</a>
</span>
- <span class="portletBottomRight"></span>
+ <span class="portletBottomRight"...
</footer>
</section>

M setup.py

diff --git a/setup.py b/setup.py
index 52285d0..4c2ad2c 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,6 @@
zip_safe=False,
install_requires=[
'setuptools',
- 'zope.cachedescriptors',
'zope.component',
'zope.interface',
'zope.ramcache',


Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2015-06-02T18:28:29+02:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/62736643cf12e1c1fffc1b8d910501386fe8907a

Merge pull request #60 from plone/tisto-cleanup-10

Remove zope.cachedescriptors dependency.

Files changed:
M setup.py

diff --git a/setup.py b/setup.py
index 52285d0..4c2ad2c 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,6 @@
zip_safe=False,
install_requires=[
'setuptools',
- 'zope.cachedescriptors',
'zope.component',
'zope.interface',
'zope.ramcache',


0 comments on commit 7673f90

Please sign in to comment.