Products.ZCatalog = 7.2.1 in Plone 6.1

[wesleybl]

Basically, what I'm looking for is this fix:

zopefoundation/Products.ZCatalog#159

Closes plone/Products.CMFPlone#3895

[wesleybl]

@jenkins-plone-org please run jobs

[davisagli]

Looks like there are 2 tests in plone.app.querystring that need to be updated, since the fix means there are now more results.

[wesleybl]

It seems that @mauritsvanrees has already fixed this error in the master branch of plone.app.querystring:

plone/plone.app.querystring#171

I'll do a backport.

[wesleybl]

I make the PR in plone.app.querystring to fix the tests:

plone/plone.app.querystring#181

I then ran Jenkins with both PRs.

[wesleybl]

I make the PR in plone.app.querystring to fix the tests:

plone/plone.app.querystring#181

I then ran Jenkins with both PRs.

The tests failed. It seems that it's not possible to run Jenkins with a PR from buildout.coredev and another from a different repository. Can anyone confirm this? @mauritsvanrees @davisagli @gforcada

What I can do is create a new PR in buildout.coredev that checkout my branch from plone.app.querystring.

[petschki]

Unfortunately this is not possible, because there is this message in the jenkins console:

+ git checkout Products.ZCatalog
error: Your local changes to the following files would be overwritten by checkout:
	checkouts.cfg
Please commit your changes or stash them before you switch branches.
Aborting

so the first parameter changed the checkouts.cfg but the second parameter wants to checkout a different branch of buildout.coredev ... you could try to switch the parameters, so that the buildout PR is the first, and the querystring PR the second line ... not testet if this works ...

[wesleybl]

... you could try to switch the parameters, so that the buildout PR is the first, and the querystring PR the second line ... not testet if this works ...

I don't remember the order in which I put them. I'll try again in that order.

Thanks!

[wesleybl]

I'll try again in that order.

That order didn't work either. I'll create a new PR just to test the plone.app.querystring branch.

[wesleybl]

When I run make run, constraints.txt is updated. Should I commit this?

[wesleybl]

When I run make run, constraints.txt is updated. Should I commit this?

I updated it.

[davisagli]

Merging based on the test results from #1074

[mauritsvanrees]

Thanks both!