diff -Nru pastescript-1.7.4.2/debian/changelog pastescript-1.7.5/debian/changelog --- pastescript-1.7.4.2/debian/changelog 2011-08-20 20:35:58.000000000 +0000 +++ pastescript-1.7.5/debian/changelog 2011-11-07 22:04:44.000000000 +0000 @@ -1,3 +1,10 @@ +pastescript (1.7.5-1) unstable; urgency=low + + * New upstream release + * Add python-cherrypy to Suggests (for egg:PasteScript#cherrypy) + + -- Piotr Ożarowski Mon, 07 Nov 2011 23:00:33 +0100 + pastescript (1.7.4.2-1) unstable; urgency=low * New upstream release diff -Nru pastescript-1.7.4.2/debian/control pastescript-1.7.5/debian/control --- pastescript-1.7.4.2/debian/control 2011-08-20 20:32:22.000000000 +0000 +++ pastescript-1.7.5/debian/control 2011-11-07 22:04:00.000000000 +0000 @@ -17,7 +17,7 @@ Depends: ${python:Depends}, ${misc:Depends}, python-paste (>= 1.3), python-pastedeploy, python-setuptools | python-distribute -Suggests: python-flup (>= 0.5-1), python-cheetah (>= 1.0-1.1), ${sphinxdoc:Depends} +Suggests: python-flup (>= 0.5-1), python-cherrypy, python-cheetah (>= 1.0-1.1), ${sphinxdoc:Depends} Description: serving web applications, creating file layouts for Python packages Paster is pluggable command-line frontend, including commands to setup package file layouts diff -Nru pastescript-1.7.4.2/docs/conf.py pastescript-1.7.5/docs/conf.py --- pastescript-1.7.4.2/docs/conf.py 2011-08-16 16:19:47.000000000 +0000 +++ pastescript-1.7.5/docs/conf.py 2011-11-07 16:11:10.000000000 +0000 @@ -34,7 +34,7 @@ # General substitutions. project = 'Paste Script' -copyright = '2008, Ian Bicking' +copyright = '2011, Ian Bicking' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. @@ -42,7 +42,7 @@ # The short X.Y version. version = '1.7' # The full version, including alpha/beta/rc tags. -release = '1.7.4.2' +release = '1.7.5' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff -Nru pastescript-1.7.4.2/docs/news.txt pastescript-1.7.5/docs/news.txt --- pastescript-1.7.4.2/docs/news.txt 2011-08-16 16:19:42.000000000 +0000 +++ pastescript-1.7.5/docs/news.txt 2011-11-07 16:10:50.000000000 +0000 @@ -3,6 +3,13 @@ .. contents:: +1.7.5 +----- + +* Import CherryPy directly instead of including its server inline in the + ``paste.script`` package. You must install CherryPy before using + ``egg:PasteScript#cherrypy`` + 1.7.4.2 ------- diff -Nru pastescript-1.7.4.2/paste/script/cherrypy_server.py pastescript-1.7.5/paste/script/cherrypy_server.py --- pastescript-1.7.4.2/paste/script/cherrypy_server.py 2009-10-28 06:36:57.000000000 +0000 +++ pastescript-1.7.5/paste/script/cherrypy_server.py 2011-11-07 15:37:55.000000000 +0000 @@ -1,7 +1,14 @@ """ Entry point for CherryPy's WSGI server """ -import paste.script.wsgiserver as wsgiserver +try: + from cherrypy import wsgiserver +except ImportError: + print '=' * 60 + print '== You must install CherryPy (pip install cherrypy) to use the egg:PasteScript#cherrypy server' + print '=' * 60 + raise + def cpwsgi_server(app, global_conf=None, host='127.0.0.1', port=None, ssl_pem=None, protocol_version=None, numthreads=None, diff -Nru pastescript-1.7.4.2/PasteScript.egg-info/PKG-INFO pastescript-1.7.5/PasteScript.egg-info/PKG-INFO --- pastescript-1.7.4.2/PasteScript.egg-info/PKG-INFO 2011-08-16 16:22:38.000000000 +0000 +++ pastescript-1.7.5/PasteScript.egg-info/PKG-INFO 2011-11-07 16:12:13.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PasteScript -Version: 1.7.4.2 +Version: 1.7.5 Summary: A pluggable command-line frontend, including commands to setup package file layouts Home-page: http://pythonpaste.org/script/ Author: Ian Bicking @@ -24,20 +24,12 @@ For the latest changes see the `news file `_. - Changes in 1.7.4.2 - ------------------ + Changes in 1.7.5 + ---------------- - * 1.7.4 had package release problems, was reverted; 1.7.4.1 also had - package problems. - - * Include special ``here`` and ``__file__`` default vars for logging - config files, similar to PasteDeploy config loading. - - * Allow Jython to import various bits from ``paste.script.command`` and - ``paste.script.copydir`` without throwing an import error (subprocess - module cannot be imported on Jython). This allows PasteScript to work - minimally on Jython, although execution will fail for - ``command.run_command`` and ``copydir.copydir``. + * Import CherryPy directly instead of including its server inline in the + ``paste.script`` package. You must install CherryPy before using + ``egg:PasteScript#cherrypy`` Keywords: web wsgi setuptools framework command-line setup diff -Nru pastescript-1.7.4.2/PKG-INFO pastescript-1.7.5/PKG-INFO --- pastescript-1.7.4.2/PKG-INFO 2011-08-16 16:22:40.000000000 +0000 +++ pastescript-1.7.5/PKG-INFO 2011-11-07 16:12:20.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PasteScript -Version: 1.7.4.2 +Version: 1.7.5 Summary: A pluggable command-line frontend, including commands to setup package file layouts Home-page: http://pythonpaste.org/script/ Author: Ian Bicking @@ -24,20 +24,12 @@ For the latest changes see the `news file `_. - Changes in 1.7.4.2 - ------------------ + Changes in 1.7.5 + ---------------- - * 1.7.4 had package release problems, was reverted; 1.7.4.1 also had - package problems. - - * Include special ``here`` and ``__file__`` default vars for logging - config files, similar to PasteDeploy config loading. - - * Allow Jython to import various bits from ``paste.script.command`` and - ``paste.script.copydir`` without throwing an import error (subprocess - module cannot be imported on Jython). This allows PasteScript to work - minimally on Jython, although execution will fail for - ``command.run_command`` and ``copydir.copydir``. + * Import CherryPy directly instead of including its server inline in the + ``paste.script`` package. You must install CherryPy before using + ``egg:PasteScript#cherrypy`` Keywords: web wsgi setuptools framework command-line setup diff -Nru pastescript-1.7.4.2/setup.py pastescript-1.7.5/setup.py --- pastescript-1.7.4.2/setup.py 2011-08-16 16:19:52.000000000 +0000 +++ pastescript-1.7.5/setup.py 2011-11-07 16:10:56.000000000 +0000 @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import re, os -version = '1.7.4.2' +version = '1.7.5' news = os.path.join(os.path.dirname(__file__), 'docs', 'news.txt') found_news = ''