Commits

cguardia committed 520e299 Draft

modernize config and update deps

  • Participants
  • Parent commits 0903504

Comments (0)

Files changed (9)

src/stage0/development.ini

-[app:birdie]
+[app:main]
 use = egg:birdie
 reload_templates = true
 debug_authorization = false
 debug_templates = true
 default_locale_name = en
 sqlalchemy.url = sqlite:///%(here)s/birdie.db
-
-[pipeline:main]
-pipeline =
-    egg:WebError#evalerror
-    tm
-    birdie
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
+pyramid.includes = pyramid_tm
+                   pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 

src/stage0/production.ini

-[app:birdie]
+[app:main]
 use = egg:birdie
 reload_templates = false
 debug_authorization = false
 debug_templates = false
 default_locale_name = en
 sqlalchemy.url = sqlite:///%(here)s/birdie.db
-
-[filter:weberror]
-use = egg:WebError#error_catcher
-debug = false
-;error_log = 
-;show_exceptions_in_wsgi_errors = true
-;smtp_server = localhost
-;error_email = janitor@example.com
-;smtp_username = janitor
-;smtp_password = "janitor's password"
-;from_address = paste@localhost
-;error_subject_prefix = "Pyramid Error"
-;smtp_use_tls =
-;error_message =
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
-[pipeline:main]
-pipeline =
-    weberror
-    tm
-    birdie
+pyramid.includes = pyramid_tm
+                   pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 

src/stage0/setup.py

 import os
-import sys
 
 from setuptools import setup, find_packages
 
 requires = [
     'pyramid',
     'SQLAlchemy',
-    'transaction',
-    'repoze.tm2>=1.0b1', # default_commit_veto
+    'pyramid_tm',
+    'pyramid_debugtoolbar',
     'zope.sqlalchemy',
-    'WebError',
+    'waitress',
     ]
 
-if sys.version_info[:3] < (2,5,0):
-    requires.append('pysqlite')
-
 setup(name='birdie',
       version='0.0',
       description='birdie',

src/stage1/development.ini

-[app:birdie]
+[app:main]
 use = egg:birdie
 reload_templates = true
 debug_authorization = false
 debug_templates = true
 default_locale_name = en
 sqlalchemy.url = sqlite:///%(here)s/birdie.db
-
-[pipeline:main]
-pipeline =
-    egg:WebError#evalerror
-    tm
-    birdie
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
+pyramid.includes = pyramid_tm
+                   pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 

src/stage1/production.ini

-[app:birdie]
+[app:main]
 use = egg:birdie
 reload_templates = false
 debug_authorization = false
 debug_templates = false
 default_locale_name = en
 sqlalchemy.url = sqlite:///%(here)s/birdie.db
-
-[filter:weberror]
-use = egg:WebError#error_catcher
-debug = false
-;error_log = 
-;show_exceptions_in_wsgi_errors = true
-;smtp_server = localhost
-;error_email = janitor@example.com
-;smtp_username = janitor
-;smtp_password = "janitor's password"
-;from_address = paste@localhost
-;error_subject_prefix = "Pyramid Error"
-;smtp_use_tls =
-;error_message =
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
-[pipeline:main]
-pipeline =
-    weberror
-    tm
-    birdie
+pyramid.includes = pyramid_tm
+                   pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 

src/stage1/setup.py

 import os
-import sys
 
 from setuptools import setup, find_packages
 
 requires = [
     'pyramid',
     'SQLAlchemy',
-    'transaction',
-    'repoze.tm2>=1.0b1', # default_commit_veto
+    'pyramid_tm',
+    'pyramid_debugtoolbar',
     'zope.sqlalchemy',
     'repoze.timeago',
-    'WebError',
+    'waitress',
     ]
 
-if sys.version_info[:3] < (2,5,0):
-    requires.append('pysqlite')
-
 setup(name='birdie',
       version='0.0',
       description='birdie',

src/stage2/development.ini

-[app:birdie]
+[app:main]
 use = egg:birdie
 reload_templates = true
 debug_authorization = false
 debug_templates = true
 default_locale_name = en
 sqlalchemy.url = sqlite:///%(here)s/birdie.db
-
-[pipeline:main]
-pipeline =
-    egg:WebError#evalerror
-    tm
-    birdie
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
+pyramid.includes = pyramid_tm
+                   pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 

src/stage2/production.ini

-[app:birdie]
+[app:main]
 use = egg:birdie
 reload_templates = false
 debug_authorization = false
 debug_templates = false
 default_locale_name = en
 sqlalchemy.url = sqlite:///%(here)s/birdie.db
-
-[filter:weberror]
-use = egg:WebError#error_catcher
-debug = false
-;error_log = 
-;show_exceptions_in_wsgi_errors = true
-;smtp_server = localhost
-;error_email = janitor@example.com
-;smtp_username = janitor
-;smtp_password = "janitor's password"
-;from_address = paste@localhost
-;error_subject_prefix = "Pyramid Error"
-;smtp_use_tls =
-;error_message =
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
-[pipeline:main]
-pipeline =
-    weberror
-    tm
-    birdie
+pyramid.includes = pyramid_tm
+                   pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:waitress#main
 host = 0.0.0.0
 port = 6543
 

src/stage2/setup.py

 import os
-import sys
 
 from setuptools import setup, find_packages
 
 requires = [
     'pyramid',
     'SQLAlchemy',
-    'transaction',
-    'repoze.tm2>=1.0b1', # default_commit_veto
+    'pyramid_tm',
+    'pyramid_debugtoolbar',
     'zope.sqlalchemy',
     'repoze.timeago',
     'cryptacular',
-    'WebError',
+    'waitress',
     ]
 
-if sys.version_info[:3] < (2,5,0):
-    requires.append('pysqlite')
-
 setup(name='birdie',
       version='0.0',
       description='birdie',