rattail/rattail-demo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove version caps for pyramid; stop auto-config for postgres error retry

Browse source
This commit is contained in:
Lance Edgar 2018-08-17 12:57:24 -05:00
parent ba95d39780
commit 12c8b3b8dd
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rattail_demo/web/app.py
View file

@ -12,9 +12,6 @@ def main(global_config, **settings):
""" """
This function returns a Pyramid WSGI application. This function returns a Pyramid WSGI application.
""" """
# set some defaults for PostgreSQL
app.provide_postgresql_settings(settings)
# prefer demo templates over tailbone # prefer demo templates over tailbone
settings.setdefault('mako.directories', ['rattail_demo.web:templates', settings.setdefault('mako.directories', ['rattail_demo.web:templates',
'tailbone:templates',]) 'tailbone:templates',])
@ -28,7 +25,4 @@ def main(global_config, **settings):
pyramid_config.include('rattail_demo.web.subscribers') pyramid_config.include('rattail_demo.web.subscribers')
pyramid_config.include('rattail_demo.web.views') pyramid_config.include('rattail_demo.web.views')
# configure PostgreSQL some more
app.configure_postgresql(pyramid_config)
return pyramid_config.make_wsgi_app() return pyramid_config.make_wsgi_app()

10
setup.py
View file

@ -43,16 +43,6 @@ requires = [
# #
# package # low high # package # low high
# TODO: Pyramid 1.9 looks like it breaks us..? playing it safe for now..
'pyramid<1.9', # 1.3b2 1.8.3
# apparently 2.0 removes the retry support, in which case we then need
# pyramid_retry .. but that requires pyramid 1.9 ...
'pyramid_tm<2.0', # 0.3 1.1.1
# TODO: why do we need to cap this? breaks tailbone.db zope stuff somehow
'zope.sqlalchemy<1.0', # 0.7 0.7.7
'invoke', # 0.22.1 'invoke', # 0.22.1
'psycopg2', # 2.6.2 'psycopg2', # 2.6.2
'rattail-corepos', # 0.1.0 'rattail-corepos', # 0.1.0