Allow multiple Plone instances in one Zope app #191
Merged
Conversation
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
|
@tomgross LGTM. Travis is failing though. |
tisto
reviewed
Jul 12, 2018
.travis.yml
Outdated
| - virtualenv . | ||
| - bin/pip install --upgrade pip setuptools zc.buildout | ||
| - virtualenv -p `which python` . | ||
| - bin/pip install setuptools==33.1.1 zc.buildout==2.9.5 |
There was a problem hiding this comment.
@tomgross pinning is a good thing. I prefer to have it in requirements.txt, to make sure it is used everywhere (local dev, travis).
tisto
reviewed
Jul 12, 2018
src/collective/solr/utils.py
Outdated
| @@ -63,6 +64,10 @@ def prepareData(data): | |||
| path = data.get('path') | |||
| if isinstance(path, dict) and not path.get('query'): | |||
| data.pop('path') | |||
| if not path in data: | |||
There was a problem hiding this comment.
@tomgross I'd suggest adding a comment here why this block is necessary.
tomgross
force-pushed
the
5.x-multiple_instances
branch
from
ef379e1
to
b415f4c
Compare
|
@tisto The tests are always right 😉 The This also pins zc.buildout and setuptools to fix travis, which is broken on master. |
|
@tomgross merged. Sorry, it took so long. I plan to do a new release soon and I will push things further to have a final c.solr release in the next weeks... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#163