Bump setuptools to 37.0.0 (latest):

 move `__version__` from `./mfr/__init__.py`
 to `./version.py`, update imports and
 a few minor improvements.

Author: Johnetordoff

mfr/__init__.py

@@ -1,2 +1 @@
-__version__ = '0.22.0'
 __import__('pkg_resources').declare_namespace(__name__)

mfr/server/app.py

@@ -1,16 +1,15 @@
 import signal
 import asyncio
+import logging
 from functools import partial
 
 import tornado.web
 import tornado.httpserver
 import tornado.platform.asyncio
-import logging
-
 from raven.contrib.tornado import AsyncSentryClient
 
-import mfr
 from mfr import settings
+from version import __version__
 from mfr.server import settings as server_settings
 from mfr.server.handlers.export import ExportHandler
 from mfr.server.handlers.render import RenderHandler
@@ -33,6 +32,7 @@ def stop_loop():
 
     io_loop.add_callback_from_signal(stop_loop)
 
+
 def make_app(debug):
     app = tornado.web.Application(
         [
@@ -46,7 +46,7 @@ def make_app(debug):
         ],
         debug=debug,
     )
-    app.sentry_client = AsyncSentryClient(settings.SENTRY_DSN, release=mfr.__version__)
+    app.sentry_client = AsyncSentryClient(settings.SENTRY_DSN, release=__version__)
     return app
 
 

mfr/server/handlers/status.py

@@ -1,12 +1,13 @@
 import tornado.web
 
-import mfr
+from version import __version__
+
 
 class StatusHandler(tornado.web.RequestHandler):
 
     def get(self):
         """List information about modular-file-renderer status"""
         self.write({
             'status': 'up',
-            'version': mfr.__version__
+            'version': __version__
         })

requirements.txt

@@ -5,7 +5,7 @@ humanfriendly==2.1
 invoke==0.13.0
 mako==1.0.1
 raven==5.27.0
-setuptools==30.4.0
+setuptools==37.0.0
 stevedore==1.2.0
 tornado==4.3
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-from mfr import __version__
+from version import __version__
 
 
 def parse_requirements(requirements):

tests/server/handlers/test_status.py

@@ -1,15 +1,19 @@
-import mfr
 import json
-from tests import utils
+from http import HTTPStatus
+
+
 from tornado import testing
 
+from tests import utils
+from version import __version__
+
 
 class TestStatusHandler(utils.HandlerTestCase):
     @testing.gen_test
     def test_get_status(self):
         resp = yield self.http_client.fetch(self.get_url('/status'))
 
         data = json.loads(resp.body.decode('utf-8'))
-        assert resp.code == 200
+        assert resp.code == HTTPStatus.OK
         assert data['status'] == 'up'
-        assert data['version'] == mfr.__version__
+        assert data['version'] == __version__

version.py

@@ -0,0 +1 @@
+__version__ = '0.22.0'