[Checkins] SVN: zopyx.smartprintng.server/trunk/ compatibility with Pyramid 1.0b3+

[Andreas Jung]

Log message for revision 120007:
  compatibility with Pyramid 1.0b3+
  

Changed:
  U   zopyx.smartprintng.server/trunk/docs/HISTORY.txt
  U   zopyx.smartprintng.server/trunk/setup.py
  U   zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/configure.zcml
  U   zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/run.py

-=-
Modified: zopyx.smartprintng.server/trunk/docs/HISTORY.txt
===================================================================
--- zopyx.smartprintng.server/trunk/docs/HISTORY.txt	2011-01-30 13:17:54 UTC (rev 120006)
+++ zopyx.smartprintng.server/trunk/docs/HISTORY.txt	2011-01-30 13:24:07 UTC (rev 120007)
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.0.1 (2011/01/30)
+------------------
+* compatibility with Pyramid 1.0b3+
+
 1.0.0 (2011/01/16)
 ------------------
 * final release

Modified: zopyx.smartprintng.server/trunk/setup.py
===================================================================
--- zopyx.smartprintng.server/trunk/setup.py	2011-01-30 13:17:54 UTC (rev 120006)
+++ zopyx.smartprintng.server/trunk/setup.py	2011-01-30 13:24:07 UTC (rev 120007)
@@ -10,7 +10,7 @@
 if sys.version_info < (2,6):
     raise RuntimeError('Please use Python 2.6.X')
 
-version = '1.0.0'
+version = '1.0.1'
 
 setup(name='zopyx.smartprintng.server',
       version=version,
@@ -34,6 +34,7 @@
       install_requires=[
           'setuptools',
           'pyramid',
+          'pyramid_zcml',
           'pyramid_xmlrpc==0.1',
           'uuid',
           'zopyx.convert2',

Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/configure.zcml
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/configure.zcml	2011-01-30 13:17:54 UTC (rev 120006)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/configure.zcml	2011-01-30 13:24:07 UTC (rev 120007)
@@ -2,7 +2,7 @@
            xmlns:mail="http://namespaces.repoze.org/mail">
 
   <!-- this must be included for the view declarations to work -->
-  <include package="pyramid.includes" />
+  <include package="pyramid_zcml" />
 
   <scan package="."/>
 

Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/run.py
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/run.py	2011-01-30 13:17:54 UTC (rev 120006)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/run.py	2011-01-30 13:24:07 UTC (rev 120007)
@@ -4,7 +4,7 @@
 ##########################################################################
 
 import os
-from pyramid.router import make_app
+from pyramid_zcml import make_app
 import mail_util
 from views import have_authentication