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.

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

Fix bin/zinstance script for wsgi=on #48

Merged
merged 5 commits into from Aug 24, 2018
Merged

Fix bin/zinstance script for wsgi=on #48

merged 5 commits into from Aug 24, 2018

Conversation

icemac
Copy link

@icemac icemac commented Aug 8, 2018

Stripping of the first argument of argv is already done again in https://github.com/zopefoundation/Zope/blob/master/src/Zope2/Startup/serve.py#L136 which is called by Zope2.Startup.serve.main.

This extends the fix of #44, so I think no change log entry is needed.

Stripping of the first argument of `argv` is already done again in https://github.com/zopefoundation/Zope/blob/master/src/Zope2/Startup/serve.py#L136 which is called by `Zope2.Startup.serve.main`.
@icemac icemac requested a review from tschorr August 8, 2018 08:32
@tschorr
Copy link
Contributor

tschorr commented Aug 22, 2018

Lgtm. We'll need to change https://github.com/plone/buildout.coredev/blob/ad56ba4955ce4930cd9fc4abb9754c12463f4943/wsgi.cfg#L47 (remove --ini) once this is merged.

Python 3 does not have an `__init__.py` in namespace packages installed via pip.
(See https://www.python.org/dev/peps/pep-0420/.) This breaks the tests because
`zc.buildout` which was installed via pip can no longer be found by the test
script.

Now `tox.ini` and `.travis.yml` install all packages via pip to resolve the
iussue. (This led to some test failures in Python 2.7 which I fixed in the
tests.)
@tschorr
Copy link
Contributor

tschorr commented Aug 23, 2018

This extends the fix of #44, so I think no change log entry is needed.

@icemac at least the testing changes are worth a changelog entry after all?

@tschorr
Copy link
Contributor

tschorr commented Aug 24, 2018

Jenkins failure is unrelated (Jenkins was green without the Changelog modification).

@tschorr tschorr merged commit 92591d4 into master Aug 24, 2018
@tschorr tschorr deleted the fix-wsgi-script branch August 24, 2018 10:58
tschorr added a commit to plone/buildout.coredev that referenced this pull request Aug 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants