Merge aeba625 into 9346c41

.coveragerc

@@ -0,0 +1,10 @@
+[run]
+source = zc.zope3recipes
+parallel = true
+data_file = $COVERAGE_HOME/.coverage
+
+[paths]
+source =
+    zc/
+    .tox/*/lib/python*/site-packages/zc/
+    .tox/pypy*/site-packages/zc/

.gitignore

@@ -0,0 +1,10 @@
+*.py[co]
+.tox/
+*.egg-info
+.coverage
+.installed.cfg
+bin/
+eggs/
+develop-eggs/
+parts/
+.coverage*

.travis.yml

@@ -0,0 +1,18 @@
+language: python
+dist: xenial
+python:
+  - 2.7
+install:
+  - pip install zope.testrunner coverage coveralls
+  - pip install -e '.[tests]'
+script:
+  - export COVERAGE_HOME=$(pwd)
+  - export COVERAGE_PROCESS_START=$COVERAGE_HOME/.coveragerc
+  - coverage run -m zope.testrunner --test-path=. -vc
+after_script:
+  - coverage combine
+  - coverage report -m
+  - coveralls
+notifications:
+  email: false
+cache: pip

MANIFEST.in

@@ -0,0 +1,3 @@
+include *.py
+include buildout.cfg
+recursive-include zc *.txt

README.txt

@@ -20,6 +20,14 @@ Unfortunately, partial Windows support at this time.  It works but it's alpha.
 Releases
 ********
 
+===================
+0.19.0 (unreleased)
+===================
+
+- Fix TypeError: <lambda>() takes no arguments (1 given) on Windows
+  with zdaemon >= 3.0.0.
+
+
 ===================
 0.18.0 (2013/02/05)
 ===================

appveyor.yml

@@ -0,0 +1,23 @@
+version: build-{build}-{branch}
+
+environment:
+  matrix:
+    # https://www.appveyor.com/docs/installed-software#python lists available
+    # versions
+    - PYTHON: "C:\\Python27"
+
+init:
+  - "echo %PYTHON%"
+
+install:
+  - "set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - python --version
+  # Upgrade virtualenv because the one in the Appveyor image is old and has an
+  # old bundled pip version that thinks 'zc.recipe.egg' is an egg.
+  - pip install -U virtualenv
+  - pip install tox
+
+build: off
+
+test_script:
+  - tox -e py

setup.py

@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-name, version = "zc.zope3recipes", "0"
+name, version = "zc.zope3recipes", "0.19.0.dev0"
 
 import os
 from setuptools import setup, find_packages
@@ -58,7 +58,7 @@ def read(*rnames):
              ],
         },
     extras_require = dict(
-        tests = ['zdaemon', 'zc.recipe.filestorage', 'PasteScript'],
+        tests=['zdaemon >= 3.0.0', 'zc.recipe.filestorage', 'PasteScript'],
         ),
     classifiers=[
         "Development Status :: 5 - Production/Stable",

tox.ini

@@ -0,0 +1,30 @@
+[tox]
+envlist = py27
+
+[testenv]
+usedevelop = true
+deps =
+    zope.testrunner
+extras =
+    tests
+commands =
+    zope-testrunner --test-path=. {posargs:-vc}
+
+[testenv:coverage]
+basepython = python2.7
+deps =
+    {[testenv]deps}
+    coverage
+commands =
+    coverage run -m zope.testrunner --test-path=. {posargs:-vc}
+    coverage combine
+    coverage report -m
+setenv =
+    COVERAGE_HOME={toxinidir}
+    COVERAGE_PROCESS_START={toxinidir}/.coveragerc
+
+[testenv:py]
+platform = win32
+deps =
+    {[testenv]deps}
+    pypiwin32

zc/zope3recipes/README.txt

@@ -109,7 +109,7 @@ in ``sys.path``.  Similarly debugzope script is also changed:
     sys.path[0:0] = [
       '/sample-buildout/demo2',
       '/sample-buildout/demo1',
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zope.app.twisted.main
@@ -174,7 +174,7 @@ before server is started:
     sys.path[0:0] = [
       '/sample-buildout/demo2',
       '/sample-buildout/demo1',
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     print "Starting application server."
@@ -224,7 +224,7 @@ Now, Let's run the buildout and see what we get:
     sys.path[0:0] = [
       '/sample-buildout/demo2',
       '/sample-buildout/demo1',
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     print "Starting debugging interaction."
@@ -289,7 +289,7 @@ Now, Let's run the buildout and see what we get:
     sys.path[0:0] = [
       '/sample-buildout/demo2',
       '/sample-buildout/demo1',
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zope.app.twisted.main
@@ -380,7 +380,7 @@ Similarly, debugzope script has relative paths.
     sys.path[0:0] = [
       join(base, 'demo2'),
       join(base, 'demo1'),
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zope.app.twisted.main
@@ -542,7 +542,7 @@ variables available as global variables.
       '/sample-buildout/demo2',
       '/sample-buildout/demo1',
       '/zope3/src',
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zope.app.twisted.main
@@ -682,7 +682,7 @@ The debugzope script has also been modified to take this into account.
       '/sample-buildout/demo2',
       '/sample-buildout/demo1',
       '/zope3/src',
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zope.app.server.main
@@ -776,7 +776,7 @@ The debugzope script also has relative paths.
       join(base, 'demo2'),
       join(base, 'demo1'),
       '/zope3/src',
-      '/zope3recipes',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zope.app.server.main
@@ -1559,10 +1559,8 @@ in the buildout bin directory:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      '/sample-buildout/eggs/zdaemon-2.0-py2.4.egg',
-      '/sample-buildout/eggs/setuptools-0.6-py2.4.egg',
-      '/sample-buildout/eggs/ZConfig-2.3-py2.4.egg',
-      '/zope3recipes',
+      '/site-packages',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zc.zope3recipes.ctl
@@ -1878,7 +1876,7 @@ rc-directory
     installed.
 
 logrotate-directory
-    The name ot the directory where logrotate configuration files should be
+    The name of the directory where logrotate configuration files should be
     installed.
 
 user
@@ -2449,10 +2447,8 @@ in a buildout configuration.
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      join(base, 'eggs/zdaemon-pyN.N.egg'),
-      join(base, 'eggs/setuptools-pyN.N.egg'),
-      join(base, 'eggs/ZConfig-pyN.N.egg'),
-      '/zope3recipes',
+      '/site-packages',
+      '/zc.zope3recipes',
       ]
     <BLANKLINE>
     import zc.zope3recipes.ctl
@@ -3149,14 +3145,10 @@ paste-based instance start scripts.
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-        '/sample-buildout/demo2',
-        '/sample-buildout/eggs/PasteScript-1.7.4.2-py2.6.egg',
-        '/sample-buildout/eggs/setuptools-0.6c12dev_r88846-py2.6.egg',
-        '/sample-buildout/eggs/PasteDeploy-1.5.0-py2.6.egg',
-        '/sample-buildout/eggs/Paste-1.7.5.1-py2.6.egg',
-        '/sample-buildout/demo1',
-        ]
-    <BLANKLINE>
+      '/sample-buildout/demo2',
+      '/sample-buildout/demo1',
+      '/site-packages',
+      ]
     <BLANKLINE>
     import paste.script.command
     <BLANKLINE>