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

Update 4.3 to Zope 2.13.23 #100

Merged
merged 1 commit into from
Sep 14, 2015
Merged

Update 4.3 to Zope 2.13.23 #100

merged 1 commit into from
Sep 14, 2015

Conversation

mauritsvanrees
Copy link
Member

No description provided.

@mauritsvanrees
Copy link
Member Author

Pull request number 100. :-)

http://jenkins.plone.org/job/pull-request-4.3/66/

@mauritsvanrees
Copy link
Member Author

Several errors are emerging, just like for #99 (plone 5 branch).

@mauritsvanrees
Copy link
Member Author

http://jenkins.plone.org/job/pull-request-4.3/67/console

@jensens jensens changed the title Update 4.3 to Zope 2.13.13 Update 4.3 to Zope 2.13.23 Jul 30, 2015
@mauritsvanrees
Copy link
Member Author

Let's give this another go too, Jenkins:
http://jenkins.plone.org/job/pull-request-4.3/89/

@mauritsvanrees mauritsvanrees force-pushed the maurits-43-zope-2-13-23 branch from d38c078 to 5ecf4a0 Compare September 2, 2015 11:27
@mauritsvanrees
Copy link
Member Author

Okay, that one will fail. Time for a rebase and a forced push. Trying again:
http://jenkins.plone.org/job/pull-request-4.3/90/

@mauritsvanrees
Copy link
Member Author

Failing tests in Jenkins:

Products.CMFPlone.tests.test_robot.RobotTestCase.Scenario New user overlay closes on valid data
Products.CMFPlone.tests.test_robot.RobotTestCase.Scenario Select All items
plone.app.jquerytools.tests.ploneIntegration.txt

It seems the newer zope.testrunner may have something to do with it, due to changes in the order of test layers. With 4.4.9 I get this error locally:

$ bin/test -s Products.CMFDiffTool
...
Running Products.CMFDiffTool.testing.PackageLayer tests:
  Tear down Products.CMFDiffTool.tests.BaseTestCase.CMFDiffToolLayer in 0.195 seconds.
  Set up collective.testcaselayer.ptc.PTCLayer Traceback (most recent call last):
  File "/Users/mauritsvanrees/shared-eggs/zope.testrunner-4.4.9-py2.6.egg/zope/testrunner/runner.py", line 411, in run_layer
    setup_layer(options, layer, setup_layers)
  File "/Users/mauritsvanrees/shared-eggs/zope.testrunner-4.4.9-py2.6.egg/zope/testrunner/runner.py", line 719, in setup_layer
    setup_layer(options, base, setup_layers)
  File "/Users/mauritsvanrees/shared-eggs/zope.testrunner-4.4.9-py2.6.egg/zope/testrunner/runner.py", line 719, in setup_layer
    setup_layer(options, base, setup_layers)
  File "/Users/mauritsvanrees/shared-eggs/zope.testrunner-4.4.9-py2.6.egg/zope/testrunner/runner.py", line 719, in setup_layer
    setup_layer(options, base, setup_layers)
  File "/Users/mauritsvanrees/shared-eggs/zope.testrunner-4.4.9-py2.6.egg/zope/testrunner/runner.py", line 724, in setup_layer
    layer.setUp()
  File "/Users/mauritsvanrees/shared-eggs/collective.testcaselayer-1.6.1-py2.6.egg/collective/testcaselayer/sandbox.py", line 41, in setUp
    result = super(Sandboxed, self).setUp()
  File "/Users/mauritsvanrees/shared-eggs/collective.testcaselayer-1.6.1-py2.6.egg/collective/testcaselayer/ztc.py", line 51, in setUp
    self.portal = self._portal()
  File "/Users/mauritsvanrees/shared-eggs/Products.PloneTestCase-0.9.18-py2.6.egg/Products/PloneTestCase/PloneTestCase.py", line 70, in _portal
    portal = self.getPortal()
  File "/Users/mauritsvanrees/shared-eggs/Products.PloneTestCase-0.9.18-py2.6.egg/Products/PloneTestCase/PloneTestCase.py", line 107, in getPortal
    return getattr(self.app, portal_name)
AttributeError: plone

Tearing down left over layers:
  Tear down Products.PloneTestCase.layer.PloneSite in 0.001 seconds.
  Tear down Products.PloneTestCase.layer.ZCML in 0.006 seconds.
  Tear down Testing.ZopeTestCase.layer.ZopeLite in 0.000 seconds.
Total: 60 tests, 0 failures, 1 errors, 0 skipped in 18.399 seconds.

Reverting to 4.4.4 fixes that error. See also pull request #72 that only updates the zope.testrunner version.

So go ahead again, Jenkins: http://jenkins.plone.org/job/pull-request-4.3/91/

@mauritsvanrees
Copy link
Member Author

Hah, now Jenkins passes. Woohoo!
Review please.

@mauritsvanrees mauritsvanrees mentioned this pull request Sep 2, 2015
Merged
@pbauer
Copy link
Member

pbauer commented Sep 13, 2015

@mauritsvanrees why do you update robotframework-stuff as well (to newer versions than P5 uses)? That should be a different PR.

@mauritsvanrees
Update to Zope 2.13.13
adbc163 
Stick to old pytz 2013b.
A few newer test package versions needed.
@mauritsvanrees
Copy link
Member Author

I had super good reasons for this. Probably. I don't know them anymore. ;-)
Let's try again with minimum changes. I rebased, edited, and did a forced push on this branch.
Jenkins, go ahead: http://jenkins.plone.org/job/pull-request-4.3/96/

@mauritsvanrees
Copy link
Member Author

Jenkins is happy as a puppy.

pbauer added a commit that referenced this pull request Sep 14, 2015
@pbauer
Merge pull request #100 from plone/maurits-43-zope-2-13-23
5e84d48 
Update 4.3 to Zope 2.13.23
@pbauer pbauer merged commit 5e84d48 into 4.3 Sep 14, 2015
@pbauer pbauer deleted the maurits-43-zope-2-13-23 branch September 14, 2015 11:18
mister-roboto pushed a commit that referenced this pull request Mar 14, 2016
@jensens
[fc] Repository: plone.app.theming
728a749 
Branch: refs/heads/master
Date: 2016-03-11T13:55:15+01:00
Author: Johannes Raggam (thet) <[email protected]>
Commit: plone/plone.app.theming@4e088e4

Use ``getSite()`` instead of portal url
Change base URLs from portal URL to what getSite returns, but don't change the theming controlpanel context binding.
This allows for more flexibility when configuring it to be allowed on a sub site with a local registry.

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/controlpanel.pt
M src/plone/app/theming/browser/controlpanel.py
Repository: plone.app.theming
Branch: refs/heads/master
Date: 2016-03-11T14:10:16+01:00
Author: Johannes Raggam (thet) <[email protected]>
Commit: plone/plone.app.theming@2d36d66

typo

Files changed:
M CHANGES.rst
Repository: plone.app.theming
Branch: refs/heads/master
Date: 2016-03-14T11:06:33+01:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.theming@a075790

Merge pull request #100 from plone/thet_site_url

Use ``getSite()`` instead of portal url

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/controlpanel.pt
M src/plone/app/theming/browser/controlpanel.py
mister-roboto pushed a commit that referenced this pull request Mar 14, 2016
@jensens
[fc] Repository: plone.app.theming
f05a3a6 
Branch: refs/heads/master
Date: 2016-03-11T13:55:15+01:00
Author: Johannes Raggam (thet) <[email protected]>
Commit: plone/plone.app.theming@4e088e4

Use ``getSite()`` instead of portal url
Change base URLs from portal URL to what getSite returns, but don't change the theming controlpanel context binding.
This allows for more flexibility when configuring it to be allowed on a sub site with a local registry.

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/controlpanel.pt
M src/plone/app/theming/browser/controlpanel.py
Repository: plone.app.theming
Branch: refs/heads/master
Date: 2016-03-11T14:10:16+01:00
Author: Johannes Raggam (thet) <[email protected]>
Commit: plone/plone.app.theming@2d36d66

typo

Files changed:
M CHANGES.rst
Repository: plone.app.theming
Branch: refs/heads/master
Date: 2016-03-14T11:06:33+01:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.theming@a075790

Merge pull request #100 from plone/thet_site_url

Use ``getSite()`` instead of portal url

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/controlpanel.pt
M src/plone/app/theming/browser/controlpanel.py
mister-roboto pushed a commit that referenced this pull request Jun 6, 2016
@mauritsvanrees
[fc] Repository: plone.app.discussion
42f8e1c 
Branch: refs/heads/2.2.x
Date: 2016-05-30T09:45:13+02:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: plone/plone.app.discussion@4ce3643

Fixed possible cross site scripting (XSS) attack on moderate comments page.

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/moderation.pt
Repository: plone.app.discussion
Branch: refs/heads/2.2.x
Date: 2016-06-06T10:10:35+02:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: plone/plone.app.discussion@fd67141

Merge pull request #100 from plone/maurits-xss-22

Fixed possible cross site scripting attack on moderate comments page [2.2]

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/moderation.pt
mister-roboto pushed a commit that referenced this pull request Jun 17, 2017
@thet
[fc] Repository: plone.app.portlets
f905880 
Branch: refs/heads/master
Date: 2017-06-16T11:29:58+02:00
Author: Franz Gerhard Reinisch (fgrcon) <[email protected]>
Commit: plone/plone.app.portlets@af4e921

further fixes for plip 1734-attribute-renames

Files changed:
M plone/app/portlets/portlets/recent.py
M plone/app/portlets/portlets/review.py
Repository: plone.app.portlets
Branch: refs/heads/master
Date: 2017-06-17T22:57:53+02:00
Author: Johannes Raggam (thet) <[email protected]>
Commit: plone/plone.app.portlets@624fb27

Merge pull request #100 from plone/fgrcon-cleanup_2-1734

further fixes for plip 1734-attribute-renames

Files changed:
M plone/app/portlets/portlets/recent.py
M plone/app/portlets/portlets/review.py
mister-roboto pushed a commit that referenced this pull request Feb 7, 2019
@jensens
[fc] Repository: plone.app.robotframework
c852739 
Branch: refs/heads/master
Date: 2019-02-07T12:55:32+01:00
Author: ale-rt (ale-rt) <[email protected]>
Commit: plone/plone.app.robotframework@2c6ad4b

Fix the travis build

Fixes #100

Files changed:
M .travis.yml
M CHANGES.rst
Repository: plone.app.robotframework

Branch: refs/heads/master
Date: 2019-02-07T14:18:37+01:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.robotframework@3a7d3e7

Merge pull request #101 from plone/fix-travis

Fix the travis build

Files changed:
M .travis.yml
M CHANGES.rst
mister-roboto pushed a commit that referenced this pull request May 10, 2022
@jensens
[fc] Repository: plone.app.caching
1c66652 
Branch: refs/heads/master
Date: 2022-05-06T17:54:37+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.caching@5a7a23b

move ruleset assignments to plone.restapi

Files changed:
M plone/app/caching/caching.zcml
M plone/app/caching/configure.zcml
Repository: plone.app.caching

Branch: refs/heads/master
Date: 2022-05-06T17:58:39+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.caching@982da28

add newsfile

Files changed:
A news/100.feature
Repository: plone.app.caching

Branch: refs/heads/master
Date: 2022-05-06T18:10:12+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.caching@a2f112f

zpretty

Files changed:
M plone/app/caching/configure.zcml
Repository: plone.app.caching

Branch: refs/heads/master
Date: 2022-05-08T00:30:48+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.caching@0527f84

move tests to restapi

Files changed:
M plone/app/caching/testing.py
M plone/app/caching/tests/test_profile_with_caching_proxy.py
M plone/app/caching/tests/test_profile_without_caching_proxy.py
M setup.py
Repository: plone.app.caching

Branch: refs/heads/master
Date: 2022-05-10T17:13:47+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.app.caching@f41fb7c

Merge pull request #100 from plone/move-to-restapi

move ruleset assignments to plone.restapi

Files changed:
A news/100.feature
M plone/app/caching/caching.zcml
M plone/app/caching/configure.zcml
M plone/app/caching/testing.py
M plone/app/caching/tests/test_profile_with_caching_proxy.py
M plone/app/caching/tests/test_profile_without_caching_proxy.py
M setup.py
mister-roboto pushed a commit that referenced this pull request Nov 18, 2022
@tisto
[fc] Repository: plone.volto
a7b9827 
Branch: refs/heads/main
Date: 2022-11-18T04:06:28+01:00
Author: Timo Stollenwerk (tisto) <[email protected]>
Commit: plone/plone.volto@6fcfb4b

Upgrade buildout to Plone 6 beta 3 (#100)

Files changed:
M plone-6.0.x.cfg
mister-roboto pushed a commit that referenced this pull request Apr 4, 2023
@gforcada
[fc] Repository: plone.schemaeditor
0d7a7b7 
Branch: refs/heads/master
Date: 2023-04-03T23:52:49Z
Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Commit: plone/plone.schemaeditor@a89cb05

[pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 23.1.0 → 23.3.0](psf/black@23.1.0...23.3.0)
- [github.com/collective/zpretty: 3.0.2 → 3.0.3](collective/zpretty@3.0.2...3.0.3)
- [github.com/codespell-project/codespell: v2.2.2 → v2.2.4](codespell-project/codespell@v2.2.2...v2.2.4)

Files changed:
M .pre-commit-config.yaml
Repository: plone.schemaeditor

Branch: refs/heads/master
Date: 2023-04-04T23:37:24+02:00
Author: Gil Forcada Codinachs (gforcada) <[email protected]>
Commit: plone/plone.schemaeditor@62fc956

chore: codespell

Files changed:
M CHANGES.rst
Repository: plone.schemaeditor

Branch: refs/heads/master
Date: 2023-04-04T23:38:05+02:00
Author: Gil Forcada Codinachs (gforcada) <[email protected]>
Commit: plone/plone.schemaeditor@c3f4618

Merge pull request #100 from plone/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Files changed:
M .pre-commit-config.yaml
M CHANGES.rst
mister-roboto pushed a commit that referenced this pull request Apr 12, 2023
@jensens
[fc] Repository: plone.protect
9ce7650 
Branch: refs/heads/master
Date: 2023-04-12T00:07:22+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@f46ebf8

Configuring with plone/meta

Files changed:
A .editorconfig
A .meta.toml
A .pre-commit-config.yaml
A news/a9dd65cc.internal
A tox.ini
M pyproject.toml
M setup.cfg
Repository: plone.protect

Branch: refs/heads/master
Date: 2023-04-12T00:07:22+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@49b2a76

Bumped version for breaking release.

Files changed:
M setup.py
Repository: plone.protect

Branch: refs/heads/master
Date: 2023-04-12T00:07:22+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@f9af79b

Drop support for Python 2.7 up to 3.7.

Files changed:
A news/5390ebc6.feature
M CHANGES.rst
M plone/__init__.py
M plone/protect/__init__.py
M plone/protect/authenticator.py
M plone/protect/auto.py
M plone/protect/configure.zcml
M plone/protect/confirm.pt
M plone/protect/interfaces.py
M plone/protect/monkey.py
M plone/protect/postonly.py
M plone/protect/profiles/default/metadata.xml
M plone/protect/subscribers.py
M plone/protect/testing.py
M plone/protect/tests/__init__.py
M plone/protect/tests/case.py
M plone/protect/tests/test.zcml
M plone/protect/tests/testAuthenticator.py
M plone/protect/tests/testAuto.py
M plone/protect/tests/testPatches.py
M plone/protect/tests/testPostOnly.py
M plone/protect/tests/testUtils.py
M plone/protect/tests/test_confirm_view.py
M plone/protect/utils.py
M plone/protect/views.py
M setup.py
Repository: plone.protect

Branch: refs/heads/master
Date: 2023-04-12T00:07:22+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@61363a0

adapts -&gt; adapter

Files changed:
M plone/protect/auto.py
Repository: plone.protect

Branch: refs/heads/master
Date: 2023-04-12T00:07:22+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@28c6a25

merge master

Files changed:
M plone/protect/authenticator.py
M plone/protect/auto.py
M plone/protect/subscribers.py
M plone/protect/tests/testAuthenticator.py
M pyproject.toml
M setup.py
Repository: plone.protect

Branch: refs/heads/master
Date: 2023-04-12T00:57:42+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@5f5c099

fix codespell, add ignores

Files changed:
M .meta.toml
M pyproject.toml
Repository: plone.protect

Branch: refs/heads/master
Date: 2023-04-12T00:57:58+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@d675f76

make flake8 happy

Files changed:
M plone/protect/__init__.py
M plone/protect/auto.py
M plone/protect/testing.py
Repository: plone.protect

Branch: refs/heads/master
Date: 2023-04-12T14:53:43+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.protect@58ae210

Merge pull request #100 from plone/config-with-default-template-2ef4352a

Config with default template 2ef4352a

Files changed:
A .editorconfig
A .meta.toml
A .pre-commit-config.yaml
A news/5390ebc6.feature
A news/a9dd65cc.internal
A tox.ini
M CHANGES.rst
M plone/__init__.py
M plone/protect/__init__.py
M plone/protect/authenticator.py
M plone/protect/auto.py
M plone/protect/configure.zcml
M plone/protect/confirm.pt
M plone/protect/interfaces.py
M plone/protect/monkey.py
M plone/protect/postonly.py
M plone/protect/profiles/default/metadata.xml
M plone/protect/subscribers.py
M plone/protect/testing.py
M plone/protect/tests/__init__.py
M plone/protect/tests/case.py
M plone/protect/tests/test.zcml
M plone/protect/tests/testAuthenticator.py
M plone/protect/tests/testAuto.py
M plone/protect/tests/testPatches.py
M plone/protect/tests/testPostOnly.py
M plone/protect/tests/testUtils.py
M plone/protect/tests/test_confirm_view.py
M plone/protect/utils.py
M plone/protect/views.py
M pyproject.toml
M setup.cfg
M setup.py
mister-roboto pushed a commit that referenced this pull request Nov 28, 2024
@davisagli
[fc] Repository: plone.testing
1623c79 
Branch: refs/heads/master
Date: 2024-11-27T15:53:25-03:00
Author: Peter Mathis (petschki) <[email protected]>
Commit: plone/plone.testing@dc7bcbb

Fix README for removed `unittest.makeSuite`

Files changed:
M src/plone/testing/README.rst
Repository: plone.testing

Branch: refs/heads/master
Date: 2024-11-27T15:54:45-03:00
Author: Peter Mathis (petschki) <[email protected]>
Commit: plone/plone.testing@d6b3fb6

changenote

Files changed:
A news/100.bugfix
Repository: plone.testing

Branch: refs/heads/master
Date: 2024-11-28T11:40:54-03:00
Author: David Glick (davisagli) <[email protected]>
Commit: plone/plone.testing@a7898ce

Merge pull request #100 from plone/unittest-py-3.13

Fix README for removed `unittest.makeSuite`

Files changed:
A news/100.bugfix
M src/plone/testing/README.rst
mister-roboto pushed a commit that referenced this pull request Nov 28, 2024
@davisagli
[fc] Repository: plone.testing
df6e856 
Branch: refs/heads/master
Date: 2024-11-27T15:53:25-03:00
Author: Peter Mathis (petschki) <[email protected]>
Commit: plone/plone.testing@dc7bcbb

Fix README for removed `unittest.makeSuite`

Files changed:
M src/plone/testing/README.rst
Repository: plone.testing

Branch: refs/heads/master
Date: 2024-11-27T15:54:45-03:00
Author: Peter Mathis (petschki) <[email protected]>
Commit: plone/plone.testing@d6b3fb6

changenote

Files changed:
A news/100.bugfix
Repository: plone.testing

Branch: refs/heads/master
Date: 2024-11-28T11:40:54-03:00
Author: David Glick (davisagli) <[email protected]>
Commit: plone/plone.testing@a7898ce

Merge pull request #100 from plone/unittest-py-3.13

Fix README for removed `unittest.makeSuite`

Files changed:
A news/100.bugfix
M src/plone/testing/README.rst
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
32 needs: review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mauritsvanrees @pbauer @jensens