Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Change the rest of app:main to app:bookie

- update the sample ini to not required the sentry work ootb

More main to bookie changes

Fix broken ini
  • Loading branch information...
commit 8354c803cb2a7fcc865b2076d23fbfae144ddffa 1 parent af7aa74
@mitechie authored
View
2  bookie/bcelery/celeryd.py
@@ -28,7 +28,7 @@ def load_ini():
cfg.readfp(open(ini_path))
# Hold onto the ini config.
- return dict(cfg.items('app:main', raw=True))
+ return dict(cfg.items('app:bookie', raw=True))
bookie.bcelery.ini = load_ini()
View
4 bookie/tests/__init__.py
@@ -29,7 +29,7 @@
test_ini = 'test.ini'
ini.read(test_ini)
-settings = dict(ini.items('app:main'))
+settings = dict(ini.items('app:bookie'))
BOOKIE_TEST_INI = test_ini
print "USING TEST INI: ", BOOKIE_TEST_INI
@@ -71,7 +71,7 @@ def setUp(self):
"""Setup Tests"""
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.app = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_api/__init__.py
@@ -22,7 +22,7 @@ class BookieAPITest(unittest.TestCase):
def setUp(self):
from pyramid.paster import get_app
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_api/test_admin.py
@@ -31,7 +31,7 @@ def api_key(self):
def setUp(self):
from pyramid.paster import get_app
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_auth/__init__.py
@@ -17,7 +17,7 @@ class TestAuthWeb(TestCase):
def setUp(self):
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_auth/test_reset.py
@@ -41,7 +41,7 @@ def _reset_admin(self):
def setUp(self):
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_models/test_bmarkmgr.py
@@ -19,7 +19,7 @@ def setUp(self):
"""Setup Tests"""
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_models/test_tagmgr.py
@@ -20,7 +20,7 @@ def setUp(self):
"""Setup Tests"""
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_utils/test_export.py
@@ -42,7 +42,7 @@ def _get_good_request(self):
def setUp(self):
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_utils/test_fulltext.py
@@ -21,7 +21,7 @@ def setUp(self):
"""Setup Tests"""
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_utils/test_readable.py
@@ -103,7 +103,7 @@ def setUp(self):
"""Setup Tests"""
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
2  bookie/tests/test_webviews/__init__.py
@@ -37,7 +37,7 @@ def _add_bmark(self):
def setUp(self):
from pyramid.paster import get_app
from bookie.tests import BOOKIE_TEST_INI
- app = get_app(BOOKIE_TEST_INI, 'main')
+ app = get_app(BOOKIE_TEST_INI, 'bookie')
from webtest import TestApp
self.testapp = TestApp(app)
testing.setUp()
View
6 dbversions/env.py
@@ -15,8 +15,8 @@ def load_bookie_ini(ini_file):
ini_path = path.join(path.dirname(path.dirname(__file__)), ini_file)
ini.readfp(open(ini_path))
here = path.abspath(path.join(path.dirname(__file__), '../'))
- ini.set('app:main', 'here', here)
- initialize_sql(dict(ini.items("app:main")))
+ ini.set('app:bookie', 'here', here)
+ initialize_sql(dict(ini.items("app:bookie")))
return ini
# this is the Alembic Config object, which provides
@@ -25,7 +25,7 @@ def load_bookie_ini(ini_file):
bookie_ini = config.get_main_option('app.ini', 'bookie.ini')
bookie_config = load_bookie_ini(bookie_ini)
-sa_url = bookie_config.get('app:main', 'sqlalchemy.url')
+sa_url = bookie_config.get('app:bookie', 'sqlalchemy.url')
config.set_main_option('sqlalchemy.url', sa_url)
# Interpret the config file for Python logging.
View
2  docs/hosting.rst
@@ -242,7 +242,7 @@ Then you need to create a pyramid.wsgi file in the root of your Bookie virtualen
::
from pyramid.paster import get_app
- application = get_app('/home/user/bookie/bookie/mybookie.ini', 'main')
+ application = get_app('/home/user/bookie/bookie/mybookie.ini', 'bookie')
A couple of things to check:
View
2  requirements.txt
@@ -35,7 +35,7 @@ lxml==2.3
mock==0.7.0
nose==1.1.2
pep8==0.6.1
-py-bcrypt==0.2.0
+py-bcrypt==0.3.0
pyinotify
pylint==0.23.0
pyramid<1.3
View
8 sample.ini
@@ -52,8 +52,9 @@ host = 0.0.0.0
port = 6543
[pipeline:main]
-pipeline = raven
- bookie
+pipeline = bookie
+#pipeline = raven
+# bookie
# Begin logging configuration
@@ -62,7 +63,8 @@ keys = root, bookie, sqlalchemy
# keys = root, bookie, sqlalchemy, sentry
[handlers]
-keys = console, sentry
+keys = console
+#keys = console, sentry
[formatters]
keys = generic
View
2  scripts/admin/deduper.py
@@ -19,7 +19,7 @@
'bookie.ini')
ini.readfp(open(ini_path))
- initialize_sql(dict(ini.items("app:main")))
+ initialize_sql(dict(ini.items("app:bookie")))
from bookie.models import DBSession
from bookie.models import Bmark
View
2  scripts/admin/first_bookmark.py
@@ -19,7 +19,7 @@
'bookie.ini')
ini.readfp(open(ini_path))
- initialize_sql(dict(ini.items("app:main")))
+ initialize_sql(dict(ini.items("app:bookie")))
from bookie.models import DBSession
from bookie.models import Bmark
View
4 scripts/readability/existing.py
@@ -102,8 +102,8 @@ def fetch_content(i, q):
args.ini)
ini.readfp(open(ini_path))
here = path.abspath(path.join(path.dirname(__file__), '../../'))
- ini.set('app:main', 'here', here)
- initialize_sql(dict(ini.items("app:main")))
+ ini.set('app:bookie', 'here', here)
+ initialize_sql(dict(ini.items("app:bookie")))
ct = 0
View
2  test.ini
@@ -1,4 +1,4 @@
-[app:main]
+[app:bookie]
use = egg:bookie
pyramid.reload_templates = true
pyramid.debug_authorization = false
View
2  test_mysql.ini
@@ -1,4 +1,4 @@
-[app:main]
+[app:bookie]
use = egg:bookie
pyramid.reload_templates = true
pyramid.debug_authorization = false
View
2  test_pgsql.ini
@@ -1,4 +1,4 @@
-[app:main]
+[app:bookie]
use = egg:bookie
pyramid.reload_templates = true
pyramid.debug_authorization = false
View
2  test_psql.ini
@@ -1,4 +1,4 @@
-[app:main]
+[app:bookie]
use = egg:bookie
pyramid.reload_templates = true
pyramid.debug_authorization = false
Please sign in to comment.
Something went wrong with that request. Please try again.