Cleaning up requirements

capitains_nautilus/cmd.py

@@ -1,16 +1,12 @@
 # -*- coding: utf-8 -*-
 
 from capitains_nautilus.flask_ext import FlaskNautilus
-from cts.resolver.base import NautilusCtsResolver
+from capitains_nautilus.cts.resolver.base import NautilusCtsResolver
 from werkzeug.contrib.cache import FileSystemCache, RedisCache, NullCache
 from flask import Flask
 import argparse
 import logging
 
-from tornado.wsgi import WSGIContainer
-from tornado.httpserver import HTTPServer
-from tornado.ioloop import IOLoop
-
 
 def _commandline(repositories,
                  port=8000, host="127.0.0.1", debug=False,
@@ -50,14 +46,7 @@ def _commandline(repositories,
         #logger=None
     )
     nautilus.resolver.parse()
-    if debug:
-        app.run(debug=debug, port=port, host=host)
-    else:
-        app.debug = debug
-        http_server = HTTPServer(WSGIContainer(app))
-        http_server.bind(port=port, address=host)
-        http_server.start(0)
-        IOLoop.current().start()
+    app.run(debug=debug, port=port, host=host)
 
 
 def cmd():

capitains_nautilus/cts/resolver/__init__.py

@@ -10,8 +10,8 @@
     import_logger.debug("BerkeleyDB is not installed. Its Nautilus SleepyCat implementation is not available")
 
 try:
-    import sqlalchemy
+    import rdflib_sqlalchemy
     from ._sql_alchemy import SparqlAlchemyNautilusCtsResolver
 except ImportError as e:
-    import_logger.debug("SQLAlchemy is not installed. Its Nautilus Sparql implementation is not available")
+    import_logger.debug("rdflib-sqlalchemy is not installed. Its Nautilus Sparql implementation is not available")
 

requirements.txt

@@ -1,4 +1,3 @@
-tornado>=4.3
 Flask>=0.12
 Werkzeug>=0.11.3
 redis>=2.10.5
@@ -7,4 +6,4 @@ MyCapytain>=2.0.0
 logassert
 mock==2.0.0
 rdflib-sqlalchemy>=0.3.8
-bsddb3
+bsddb3==6.2.6

setup.py

@@ -11,12 +11,9 @@
   packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
   install_requires=[
     "MyCapytain>=2.0.0",
-    "tornado>=4.3",
     "Flask>=0.12",
     "Werkzeug>=0.11.3",
-    "redis>=2.10.5",
-    "Flask-Caching>=1.4.0,<2.0.0",
-    "rdflib-sqlalchemy==0.3.8",
+    "Flask-Caching>=1.4.0,<2.0.0"
   ],
   test_requires=[
     "logassert",