From 425d1edd9977b6eec76550b8ac9b63b314529d11 Mon Sep 17 00:00:00 2001
From: furion <_@furion.me>
Date: Wed, 26 Apr 2017 19:50:10 +0200
Subject: [PATCH] fix bottle dependencies and imports
---
server/serve.py | 27 ++++++++++-----------------
setup.py | 12 +++++++++---
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/server/serve.py b/server/serve.py
index f690d537a..9239704c6 100644
--- a/server/serve.py
+++ b/server/serve.py
@@ -1,25 +1,21 @@
# -*- coding: utf-8 -*-
-import os
import json
+import logging
+import os
from datetime import datetime
-# pylint: disable=import-error, unused-import
import bottle
-from bottle.ext import sqlalchemy
-# pylint: enable=import-error
-from bottle import request
from bottle import abort
from bottle_errorsrest import ErrorsRestPlugin
-
-from sbds.sbds_json import ToStringJSONEncoder
-from sbds.server.jsonrpc import register_endpoint
-
-from steem.steemd import Steemd
+from bottle_sqlalchemy import Plugin
from hive.core import db_last_block
from hive.schema import metadata as hive_metadata
from sqlalchemy import create_engine
+from steem.steemd import Steemd
+
+from sbds.sbds_json import ToStringJSONEncoder
+from sbds.server.jsonrpc import register_endpoint
-import logging
logger = logging.getLogger(__name__)
app = bottle.Bottle()
@@ -32,10 +28,9 @@ app.config['hive.logger'] = logger
def get_db_plugin(database_url):
sa_engine = create_engine(database_url)
- Session.configure(bind=sa_engine)
# pylint: disable=undefined-variable
- return sqlalchemy.Plugin(
+ return Plugin(
# SQLAlchemy engine created with create_engine function.
sa_engine,
# SQLAlchemy metadata, required only if create=True.
@@ -46,9 +41,9 @@ def get_db_plugin(database_url):
create=False,
# If it is true, plugin commit changes after route is executed (default True).
commit=False,
- # If it is true and keyword is not defined, plugin uses **kwargs argument to inject session database (default False).
+ # If True and keyword is not defined, plugin uses **kwargs argument to inject session database (default False).
use_kwargs=False,
- create_session=Session)
+ )
app.install(
@@ -84,8 +79,6 @@ def health(db):
# --------------
jsonrpc = register_endpoint(path='/', app=app, namespace='hive')
-
-
# WSGI application
# ----------------
application = app
diff --git a/setup.py b/setup.py
index 3c8f2a7e2..a4c0f64e0 100644
--- a/setup.py
+++ b/setup.py
@@ -26,11 +26,17 @@ setup(
install_requires=[
'steem',
- 'maya',
- 'toolz',
- 'funcy',
+ 'bottle',
+ 'bottle-sqlalchemy',
+ 'bottle_errorsrest',
'sqlalchemy',
'mysqlclient',
+ 'click',
+ 'click-spinner',
+ 'funcy',
+ 'toolz',
+ 'maya',
+ 'ujson',
],
entry_points={
'console_scripts': [
--
GitLab