From 28d963911f993490745759fb42a10bbd04d2e67e Mon Sep 17 00:00:00 2001 From: icemac Date: Thu, 8 Nov 2018 13:15:13 +0100 Subject: [PATCH] [fc] Repository: plone.recipe.zope2instance Branch: refs/heads/master Date: 2018-11-08T13:15:13+01:00 Author: Michael Howitz (icemac) Commit: https://github.com/plone/plone.recipe.zope2instance/commit/88ac0deac7f72720668a020f02eb2049002c0d62 Drop `path` directive on WSGI. (#53) The WSGI server does not understand the `path` directive. The result was: `ZConfig.ConfigurationSyntaxError: u'path' is not a known key name` Files changed: M CHANGES.rst M src/plone/recipe/zope2instance/recipe.py --- last_commit.txt | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index ad99cb5c41..fd593bb22c 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,15 +1,21 @@ -Repository: plone.rest +Repository: plone.recipe.zope2instance Branch: refs/heads/master -Date: 2018-11-08T15:02:33+09:00 -Author: Timo Stollenwerk (tisto) -Commit: https://github.com/plone/plone.rest/commit/bf7deaace91314c235a9d8782862e49bb66cf8f4 +Date: 2018-11-08T13:15:13+01:00 +Author: Michael Howitz (icemac) +Commit: https://github.com/plone/plone.recipe.zope2instance/commit/88ac0deac7f72720668a020f02eb2049002c0d62 -No use to test against py3 at this point. Chicken egg problem. We need a 5.2a1 release first. +Drop `path` directive on WSGI. (#53) + +The WSGI server does not understand the `path` directive. + +The result was: +`ZConfig.ConfigurationSyntaxError: u'path' is not a known key name` Files changed: -M .travis.yml +M CHANGES.rst +M src/plone/recipe/zope2instance/recipe.py -b'diff --git a/.travis.yml b/.travis.yml\nindex 5972547..2000f62 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -16,6 +16,8 @@ matrix:\n env: PLONE_VERSION=4.3.x\n - python: 3.6\n env: PLONE_VERSION=5.0.x\n+ - python: 3.6\n+ env: PLONE_VERSION=5.1.x\n before_install:\n - mkdir -p $HOME/buildout-cache/{eggs,downloads}\n - virtualenv .\n' +b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex d18c6e6..2b8e48a 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Remove `path` option from zope.conf generated when using WSGI as it is no longer understood.\n+ [icemac]\n \n \n 6.0.0 (2018-11-08)\ndiff --git a/src/plone/recipe/zope2instance/recipe.py b/src/plone/recipe/zope2instance/recipe.py\nindex 5fa080e..01dd096 100644\n--- a/src/plone/recipe/zope2instance/recipe.py\n+++ b/src/plone/recipe/zope2instance/recipe.py\n@@ -1058,7 +1058,6 @@ def render_file_storage(self, file_storage, blob_storage,\n instancehome $INSTANCEHOME\n %%define CLIENTHOME %(client_home)s\n clienthome $CLIENTHOME\n-%(paths_lines)s\n %(products_lines)s\n debug-mode %(debug_mode)s\n security-policy-implementation %(security_implementation)s\n'