tableau · 0golovatyi · Jul 31, 2019 · Jul 30, 2019 · Jul 30, 2019 · Jul 30, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,7 @@ language: python
 python: 3.6
 install:
     - ./startup.sh --no-startup --print-install-logs
-    - pip install pytest
-    - pip install pytest-cov
-    - pip install coveralls
+    - pip install pytest pytest-cov coveralls
     - npm install -g markdownlint-cli
 script:
     - source utils/set_env.sh

diff --git a/CHANGELOG b/CHANGELOG
@@ -3,6 +3,16 @@
 This file lists notable changes for TabPy project releases.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## v0.7
+
+### Improvements
+
+- Added t-test model
+- Fixed models call with /evaluate for HTTPS
+- Migrated to Tornado 6
+- Timeout is configurable with TABPY_EVALUATE_TIMEOUT config
+  file option
+
 ## v0.6
 
 ### Improvements

diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ order:
 * [TabPy Tools](docs/tabpy-tools.md)
 
 Troubleshooting:
+
 * [FAQ for configuration, startup and other issues](docs/FAQ.md)
 
 More technical topics:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6
+0.7
diff --git a/docs/FAQ.md b/docs/FAQ.md
@@ -11,4 +11,5 @@
 
 ### AttributeError: module 'tornado.web' has no attribute 'asynchronous'
 
-TabPy uses Tornado 5.1.1. To it to your Python environment run `pip install tornado==5.1.1` and then try to start TabPy again.
+TabPy uses Tornado 5.1.1. To it to your Python environment run
+`pip install tornado==5.1.1` and then try to start TabPy again.
diff --git a/tabpy-server/setup.py b/tabpy-server/setup.py
@@ -38,16 +38,14 @@
         'decorator',
         'future',
         'genson',
-        'jsonschema~=2.3.0',
         'mock',
         'numpy',
         'pyopenssl',
         'python-dateutil',
         'requests',
         'singledispatch',
         'six',
-        'tornado==5.1.1',
-        'Tornado-JSON',
+        'tornado',
         'urllib3<1.25,>=1.21.1'
     ]
 )
diff --git a/tabpy-server/tabpy_server/app/app.py b/tabpy-server/tabpy_server/app/app.py
@@ -19,7 +19,6 @@
                                    EvaluationPlaneHandler, QueryPlaneHandler,
                                    ServiceInfoHandler, StatusHandler,
                                    UploadDestinationHandler)
-from tornado_json.constants import TORNADO_MAJOR
 import tornado
 
 
@@ -251,9 +250,7 @@ def set_parameter(settings_key,
             config=tabpy_state, settings=self.settings)
 
         self.python_service = PythonServiceHandler(PythonService())
-        self.settings['compress_response'] = True if TORNADO_MAJOR >= 4\
-            else "gzip"
-
+        self.settings['compress_response'] = True
         set_parameter(SettingsParameters.StaticPath,
                       ConfigParameters.TABPY_STATIC_PATH,
                       default_val='./')

diff --git a/tabpy-server/tabpy_server/handlers/endpoint_handler.py b/tabpy-server/tabpy_server/handlers/endpoint_handler.py
@@ -42,7 +42,6 @@ def get(self, endpoint_name):
                 self.error_out(404, 'Unknown endpoint',
                                info=f'Endpoint {endpoint_name} is not found')
 
-    @tornado.web.asynchronous
     @gen.coroutine
     def put(self, name):
         if self.should_fail_with_not_authorized():
@@ -94,7 +93,6 @@ def put(self, name):
             self.error_out(500, err_msg)
             self.finish()
 
-    @tornado.web.asynchronous
     @gen.coroutine
     def delete(self, name):
         if self.should_fail_with_not_authorized():

diff --git a/tabpy-server/tabpy_server/handlers/endpoints_handler.py b/tabpy-server/tabpy_server/handlers/endpoints_handler.py
@@ -26,7 +26,6 @@ def get(self):
         self._add_CORS_header()
         self.write(json.dumps(self.tabpy_state.get_endpoints()))
 
-    @tornado.web.asynchronous
     @gen.coroutine
     def post(self):
         if self.should_fail_with_not_authorized():

diff --git a/tabpy-server/tabpy_server/handlers/query_plane_handler.py b/tabpy-server/tabpy_server/handlers/query_plane_handler.py
@@ -9,6 +9,7 @@
 from tabpy_server.common.util import format_exception
 import urllib
 import tornado.web
+from tornado import gen
 
 
 def _get_uuid():
@@ -207,7 +208,7 @@ def _get_actual_model(self, endpoint_name):
 
         return (endpoint_name, all_endpoint_names)
 
-    @tornado.web.asynchronous
+    @gen.coroutine
     def get(self, endpoint_name):
         if self.should_fail_with_not_authorized():
             self.fail_with_not_authorized()
@@ -217,7 +218,7 @@ def get(self, endpoint_name):
         endpoint_name = urllib.parse.unquote(endpoint_name)
         self._process_query(endpoint_name, start)
 
-    @tornado.web.asynchronous
+    @gen.coroutine
     def post(self, endpoint_name):
         self.logger.log(logging.DEBUG,
                         f'Processing POST for /query/{endpoint_name}...')

diff --git a/tabpy-tools/setup.py b/tabpy-tools/setup.py
@@ -25,7 +25,6 @@
     install_requires=[
         'cloudpickle',
         'requests',
-        'genson',
-        'jsonschema'
+        'genson'
     ]
 )
diff --git a/tabpy-tools/tabpy_tools/schema.py b/tabpy-tools/tabpy_tools/schema.py
@@ -1,7 +1,7 @@
 import logging
 import genson as _genson
 
-from jsonschema import validate as _validate
+from json import validate as _validate
 
 
 logger = logging.getLogger(__name__)