Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zc.buildout 2.4.5 and setuptools 18.4 #129

Merged
merged 1 commit into from
Oct 19, 2015
Merged

zc.buildout 2.4.5 and setuptools 18.4 #129

merged 1 commit into from
Oct 19, 2015

Conversation

mauritsvanrees
Copy link
Sponsor Member

No description provided.

@mauritsvanrees
Copy link
Sponsor Member Author

http://jenkins.plone.org/job/pull-request-5.0/481/

gforcada added a commit that referenced this pull request Oct 19, 2015
@gforcada
Merge pull request #129 from plone/maurits-latest-zc-buildout-setuptools
82db441 
zc.buildout 2.4.5 and setuptools 18.4
@gforcada gforcada merged commit 82db441 into 5.0 Oct 19, 2015
@gforcada gforcada deleted the maurits-latest-zc-buildout-setuptools branch October 19, 2015 20:09
mister-roboto pushed a commit that referenced this pull request Feb 6, 2016
@mauritsvanrees
[fc] Repository: plone.app.widgets
5dda114 
Branch: refs/heads/master
Date: 2016-02-06T00:12:06+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.widgets@efd3a0b

Fixed timing issue in robot tests.

Well, that is what I hope.
Sample error link in a pull request job:
http://jenkins.plone.org/job/pull-request-5.0/841/robot/report/robot_log.html#s1-s33-t1

Files changed:
M CHANGES.rst
M plone/app/widgets/tests/robot/test_querystring_widget.robot
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2016-02-06T22:36:24+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.widgets@fb6a294

Merge pull request #129 from plone/robot-timing

Fixed timing issue in robot tests.

Files changed:
M CHANGES.rst
M plone/app/widgets/tests/robot/test_querystring_widget.robot
mister-roboto pushed a commit that referenced this pull request Jan 27, 2018
@pbauer
[fc] Repository: plone.app.discussion
909ac03 
Branch: refs/heads/master
Date: 2018-01-25T13:04:11+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.discussion@93a227c

Add Python 2 / 3 compatibility

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/comments.py
M plone/app/discussion/comment.py
M plone/app/discussion/conversation.py
M plone/app/discussion/tests/test_comments_viewlet.py
M plone/app/discussion/tests/test_conversation.py
M plone/app/discussion/tests/test_moderation_view.py
M setup.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-01-26T11:11:50+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.discussion@e4f798d

make doctest syntax py3 compatible

Files changed:
M plone/app/discussion/tests/collection-integration-test.txt
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-01-27T08:33:31+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.discussion@d7c0269

Merge pull request #129 from plone/python3

Add Python 2 / 3 compatibility

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/comments.py
M plone/app/discussion/comment.py
M plone/app/discussion/conversation.py
M plone/app/discussion/tests/collection-integration-test.txt
M plone/app/discussion/tests/test_comments_viewlet.py
M plone/app/discussion/tests/test_conversation.py
M plone/app/discussion/tests/test_moderation_view.py
M setup.py
mister-roboto pushed a commit that referenced this pull request Jan 27, 2018
@pbauer
[fc] Repository: plone.app.discussion
4fd2ad1 
Branch: refs/heads/master
Date: 2018-01-25T13:04:11+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.discussion@93a227c

Add Python 2 / 3 compatibility

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/comments.py
M plone/app/discussion/comment.py
M plone/app/discussion/conversation.py
M plone/app/discussion/tests/test_comments_viewlet.py
M plone/app/discussion/tests/test_conversation.py
M plone/app/discussion/tests/test_moderation_view.py
M setup.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-01-26T11:11:50+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.discussion@e4f798d

make doctest syntax py3 compatible

Files changed:
M plone/app/discussion/tests/collection-integration-test.txt
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-01-27T08:33:31+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.discussion@d7c0269

Merge pull request #129 from plone/python3

Add Python 2 / 3 compatibility

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/comments.py
M plone/app/discussion/comment.py
M plone/app/discussion/conversation.py
M plone/app/discussion/tests/collection-integration-test.txt
M plone/app/discussion/tests/test_comments_viewlet.py
M plone/app/discussion/tests/test_conversation.py
M plone/app/discussion/tests/test_moderation_view.py
M setup.py
mister-roboto pushed a commit that referenced this pull request Apr 15, 2019
@pbauer
[fc] Repository: Products.Archetypes
6fb917d 
Branch: refs/heads/master
Date: 2019-04-15T10:34:51+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.Archetypes@3fd297d

Fixed UnicodeEncodeError when editing Archetypes rich text.

Fixes plone/Products.CMFPlone#2832

Files changed:
A news/2832.bugfix
M Products/Archetypes/Widget.py
Repository: Products.Archetypes

Branch: refs/heads/master
Date: 2019-04-15T11:28:41+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/Products.Archetypes@0109475

Merge pull request #129 from plone/maurits-2832-unicodeencodeerror

Fixed UnicodeEncodeError when editing Archetypes rich text.

Files changed:
A news/2832.bugfix
M Products/Archetypes/Widget.py
mister-roboto pushed a commit that referenced this pull request Apr 3, 2020
@jensens
[fc] Repository: plone.dexterity
f7a14f5 
Branch: refs/heads/master
Date: 2020-04-03T00:11:48+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.dexterity@1a0513f

Travis: test on Python 3.8.

Files changed:
M .travis.yml
Repository: plone.dexterity

Branch: refs/heads/master
Date: 2020-04-03T11:12:40+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.dexterity@bbde93a

Merge pull request #129 from plone/maurits/check-python-versions

Travis: test on Python 3.8.

Files changed:
M .travis.yml
mister-roboto pushed a commit that referenced this pull request Sep 15, 2020
@jensens
[fc] Repository: plone.app.portlets
b09e848 
Branch: refs/heads/master
Date: 2019-06-09T08:55:37+02:00
Author: Andreas Jung (zopyx) <info@zopyx.com>
Commit: plone/plone.app.portlets@bc0e304

fix for plone/Products.CMFPlone#2882

Files changed:
M plone/app/portlets/portlets/navigation.py
Repository: plone.app.portlets

Branch: refs/heads/master
Date: 2019-06-09T09:01:46+02:00
Author: Andreas Jung (zopyx) <info@zopyx.com>
Commit: plone/plone.app.portlets@effba1a

added

Files changed:
A news/cmfplone-2882.bugfix
Repository: plone.app.portlets

Branch: refs/heads/master
Date: 2020-09-15T15:52:45+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.portlets@cbc4f34

Merge pull request #129 from plone/issuse-cmfplone-2882

Fixes for exception raised in navigation portlet by File with unknown content-type in mime registry

Files changed:
A news/cmfplone-2882.bugfix
M plone/app/portlets/portlets/navigation.py
mister-roboto pushed a commit that referenced this pull request May 10, 2021
@thet
[fc] Repository: plone.recipe.zope2instance
d30ec10 
Branch: refs/heads/master
Date: 2021-05-10T17:30:14+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.recipe.zope2instance@1eed0f9

Basic repoze.profile integration

Files changed:
M README.rst
M setup.py
M src/plone/recipe/zope2instance/recipe.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T17:30:14+02:00
Author: Jens Vagelpohl (dataflake) <jens@netz.ooo>
Commit: plone/plone.recipe.zope2instance@0146246

Fix syntax error due to merge conflict

Files changed:
M setup.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T17:30:14+02:00
Author: Jens Vagelpohl (dataflake) <jens@netz.ooo>
Commit: plone/plone.recipe.zope2instance@6743490

- add missing comma

Files changed:
M setup.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T17:55:44+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.recipe.zope2instance@a8ff5f0

add a test and changelog

Files changed:
A news/129.feature
M src/plone/recipe/zope2instance/recipe.py
M src/plone/recipe/zope2instance/tests/wsgi.rst
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T22:21:42+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.recipe.zope2instance@4e9af8d

make dependency optional

Files changed:
M README.rst
M setup.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T23:59:28+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.recipe.zope2instance@614afe4

Merge pull request #129 from plone/jensens-repoze.profile-integration

Basic repoze.profile integration

Files changed:
A news/129.feature
M README.rst
M setup.py
M src/plone/recipe/zope2instance/recipe.py
M src/plone/recipe/zope2instance/tests/wsgi.rst
mister-roboto pushed a commit that referenced this pull request May 10, 2021
@thet
[fc] Repository: plone.recipe.zope2instance
794599e 
Branch: refs/heads/master
Date: 2021-05-10T17:30:14+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.recipe.zope2instance@1eed0f9

Basic repoze.profile integration

Files changed:
M README.rst
M setup.py
M src/plone/recipe/zope2instance/recipe.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T17:30:14+02:00
Author: Jens Vagelpohl (dataflake) <jens@netz.ooo>
Commit: plone/plone.recipe.zope2instance@0146246

Fix syntax error due to merge conflict

Files changed:
M setup.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T17:30:14+02:00
Author: Jens Vagelpohl (dataflake) <jens@netz.ooo>
Commit: plone/plone.recipe.zope2instance@6743490

- add missing comma

Files changed:
M setup.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T17:55:44+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.recipe.zope2instance@a8ff5f0

add a test and changelog

Files changed:
A news/129.feature
M src/plone/recipe/zope2instance/recipe.py
M src/plone/recipe/zope2instance/tests/wsgi.rst
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T22:21:42+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.recipe.zope2instance@4e9af8d

make dependency optional

Files changed:
M README.rst
M setup.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2021-05-10T23:59:28+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.recipe.zope2instance@614afe4

Merge pull request #129 from plone/jensens-repoze.profile-integration

Basic repoze.profile integration

Files changed:
A news/129.feature
M README.rst
M setup.py
M src/plone/recipe/zope2instance/recipe.py
M src/plone/recipe/zope2instance/tests/wsgi.rst
mister-roboto pushed a commit that referenced this pull request Oct 2, 2021
@agitator
[fc] Repository: plone.app.z3cform
b68cd9a 
Branch: refs/heads/master
Date: 2021-09-28T18:28:35+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.z3cform@a7f60a0

Fix form error alert, includes rendering for invariants

Files changed:
A news/129.bugfix
M plone/app/z3cform/templates/macros.pt
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2021-10-02T15:07:56+02:00
Author: agitator (agitator) <agitator@users.noreply.github.com>
Commit: plone/plone.app.z3cform@c19e788

Merge pull request #129 from plone/fix-formerror-alert

Fix form error alert, includes rendering for invariants

Files changed:
A news/129.bugfix
M plone/app/z3cform/templates/macros.pt
mister-roboto pushed a commit that referenced this pull request Dec 26, 2021
@tisto
[fc] Repository: plone.rest
fad3173 
Branch: refs/heads/master
Date: 2021-12-26T21:46:55+01:00
Author: Timo Stollenwerk (tisto) <tisto@users.noreply.github.com>
Commit: plone/plone.rest@ca4ed7d

pyparsing = 2.4.5 (#129)

Files changed:
M versions.cfg
mister-roboto pushed a commit that referenced this pull request Jul 14, 2022
@mauritsvanrees
[fc] Repository: plone.namedfile
d36e26c 
Branch: refs/heads/master
Date: 2022-07-14T12:32:40+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.namedfile@1f14d31

Get title from ImageScale class.

Prevents a traceback:

```
  File "/Users/maurits/clients/zeelandia/plone60/var/cache/e7f22b3d94223db6a4dc52ff402b3a33.py", line 184, in render
    __value = _static_4510349056('python',

    "scale.scale('image', scale='large').tag(css_class='img-responsive', alt='Alt')",

    econtext=econtext)(_static_4510348768(econtext, __zt_tmp))
  File "/Users/maurits/shared-eggs/cp39/zope.tales-5.1-py3.9.egg/zope/tales/pythonexpr.py", line 73, in __call__
    return eval(self._code, vars)
  File "&lt;string&gt;", line 1, in &lt;module&gt;
File "/Users/maurits/clients/zeelandia/plone60/develop/plone.namedfile/plone/namedfile/scaling.py", line 128, in tag
    title = self.context.Title()
AttributeError: 'SimpleViewClass from /Users/maurits/clients/zeelan' object has no attribute 'Title'
```

This is when generating a tag and you do not pass an explicit `alt` and `title`.
You could override this in special cases, but we try the following now, which should fit most use cases:

- First try `self.context.Title()` like before. This should work on all content items.
- Then try `self.context.title`, which may work for tiles with a title field, and also for most other items.
- Fall back to an empty string. I think most people prefer an empty alt or title instead of a missing image tag, or an error rendering the tile.

Files changed:
A news/128.bugfix
M plone/namedfile/scaling.py
M plone/namedfile/tests/test_scaling.py
Repository: plone.namedfile

Branch: refs/heads/master
Date: 2022-07-14T15:42:25+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.namedfile@f851f65

Merge pull request #129 from plone/maurits-custom-title

Get title from ImageScale class.

Files changed:
A news/128.bugfix
M plone/namedfile/scaling.py
M plone/namedfile/tests/test_scaling.py
mister-roboto pushed a commit that referenced this pull request May 8, 2023
@mauritsvanrees
[fc] Repository: plone.app.caching
b2cebe3 
Branch: refs/heads/2.x
Date: 2023-05-08T23:23:37+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.caching@3b27a48

Changed hardcoded test date to June instead of May to temporarily fix a testing error.

See plone/plone.app.caching#127.
Needs a proper fix within a month.

Backported from master: Plone 5.2 needs it as well.

Files changed:
A news/127.tests
M plone/app/caching/tests/test_utils.py
Repository: plone.app.caching

Branch: refs/heads/2.x
Date: 2023-05-08T23:32:18+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.caching@9914019

Merge pull request #129 from plone/plone/maurits-stable-now-moved-to-june-2x

Temporary fix: change test date to June instead of May [2.x]

Files changed:
A news/127.tests
M plone/app/caching/tests/test_utils.py
mister-roboto pushed a commit that referenced this pull request Jun 7, 2024
@jensens
[fc] Repository: plone.app.users
3c7e6c9 
Branch: refs/heads/master
Date: 2024-06-06T17:48:29+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.users@cd12376

Fix error on personal-information page when you leave an existing portrait unchanged.

The previous release added validation, but this caused a regression.
Fixes plone/plone.app.users#126

Files changed:
A news/126.bugfix
M plone/app/users/browser/account.py
Repository: plone.app.users

Branch: refs/heads/master
Date: 2024-06-07T10:00:19-04:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.users@2c8f9d0

Merge pull request #129 from plone/maurits-fix-portrait-not-changed

Fix error on personal-information when leaving existing portrait unchanged

Files changed:
A news/126.bugfix
M plone/app/users/browser/account.py
mister-roboto pushed a commit that referenced this pull request Jun 7, 2024
@jensens
[fc] Repository: plone.app.users
bd392ec 
Branch: refs/heads/master
Date: 2024-06-06T17:48:29+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.users@cd12376

Fix error on personal-information page when you leave an existing portrait unchanged.

The previous release added validation, but this caused a regression.
Fixes plone/plone.app.users#126

Files changed:
A news/126.bugfix
M plone/app/users/browser/account.py
Repository: plone.app.users

Branch: refs/heads/master
Date: 2024-06-07T10:00:19-04:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.users@2c8f9d0

Merge pull request #129 from plone/maurits-fix-portrait-not-changed

Fix error on personal-information when leaving existing portrait unchanged

Files changed:
A news/126.bugfix
M plone/app/users/browser/account.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
23 status: testing 99 tag: Plone 5.x
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mauritsvanrees @gforcada