From 12c8b3b8dd7f1415443a3269a04d41663bd54131 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 17 Aug 2018 12:57:24 -0500 Subject: [PATCH] Remove version caps for pyramid; stop auto-config for postgres error retry --- rattail_demo/web/app.py | 6 ------ setup.py | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/rattail_demo/web/app.py b/rattail_demo/web/app.py index 38ea47d..b81b31a 100644 --- a/rattail_demo/web/app.py +++ b/rattail_demo/web/app.py @@ -12,9 +12,6 @@ def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ - # set some defaults for PostgreSQL - app.provide_postgresql_settings(settings) - # prefer demo templates over tailbone settings.setdefault('mako.directories', ['rattail_demo.web: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.views') - # configure PostgreSQL some more - app.configure_postgresql(pyramid_config) - return pyramid_config.make_wsgi_app() diff --git a/setup.py b/setup.py index 2259dd2..18e4bc7 100644 --- a/setup.py +++ b/setup.py @@ -43,16 +43,6 @@ requires = [ # # 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 'psycopg2', # 2.6.2 'rattail-corepos', # 0.1.0