Fix scrutinizer (tableau#454)

* Simplify scrutinizer config * Specify tests step for scrutinizer * Specify tests step for scrutinizer * Delete spelling fix step * Delete requirements_test.txt * Merge app parameters constants in one file * Delete MainHandler Co-authored-by: Olek Golovatyi <[email protected]>
pitchmeworld · Sep 11, 2020 · d30041b · d30041b
1 parent de89268
commit d30041b
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 128 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -24,7 +24,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install -r requirements_test.txt
         pip install -r requirements_dev.txt
 
     - name: Test with pytest

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -24,7 +24,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install -r requirements_test.txt
         pip install -r requirements_dev.txt
 
     - name: Lint with flake8

diff --git a/.github/workflows/pull_fix_spelling.yml b/.github/workflows/pull_fix_spelling.yml
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -24,7 +24,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install -r requirements_test.txt
         pip install -r requirements_dev.txt
 
     - name: Test with pytest

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -24,7 +24,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install -r requirements_test.txt
         pip install -r requirements_dev.txt
 
     - name: Test with pytest

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,37 +1,35 @@
-build:
-  environment:
-    python: 3.7.6
-  nodes:
-    coverage:
-      project_setup:
-        override:
-          - pip install -r requirements.txt
-          - pip install -r requirements_test.txt
-          - pip install -r requirements_dev.txt
-      tests:
-        override:
-          - command: 'pytest tests --cov=tabpy --cov-config=setup.cfg'
-            coverage:
-              file: '.coverage'
-              config_file: 'setup.cfg'
-              format: 'py-cc'
-    analysis:
-      project_setup:
-        override: 
-          - pip install -r requirements_test.txt
-      tests:
-        override: [py-scrutinizer-run]
-  tests:
-    before:
-      - pip install -r requirements.txt
-      - pip install -r requirements_test.txt
-    override: [pytest]
-checks:
-  python:
-    code_rating: true
-    duplicate_code: true
-filter:
-  excluded_paths:
-    - '*/tests/*'
-  dependency_paths:
-    - 'lib/*'
+build:
+  environment:
+    python: 3.7.6
+  nodes:
+    coverage:
+      project_setup:
+        override:
+          - pip install -r requirements.txt
+          - pip install -r requirements_dev.txt
+      tests:
+        override:
+          - command: 'pytest tests --cov=tabpy --cov-config=setup.cfg'
+            coverage:
+              file: '.coverage'
+              config_file: 'setup.cfg'
+              format: 'py-cc'
+    analysis:
+      project_setup:
+        override: 
+          - pip install -r requirements.txt
+      tests:
+        override: [py-scrutinizer-run]
+  tests:
+    before:
+      - pip install -r requirements.txt
+    override: [pytest]
+checks:
+  python:
+    code_rating: true
+    duplicate_code: true
+filter:
+  excluded_paths:
+    - '*/tests/*'
+  dependency_paths:
+    - 'lib/*'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -55,7 +55,6 @@ be able to work on TabPy changes:
    python -m pip install --upgrade pip
    pip install -r requirements.txt
    pip install -r requirements_dev.txt
-   pip install -r requirements_test.txt
    ```
 
 ## Tests

diff --git a/requirements_test.txt b/requirements_test.txt
diff --git a/setup.py b/setup.py
@@ -66,27 +66,29 @@ def read(fname):
         # but are listed here because different linux distros use custom
         # python installations.  And users can remove packages at any point
         install_requires=[
-            "backports_abc",
             "cloudpickle",
             "configparser",
-            "decorator",
+            "coverage",
+            "coveralls",
             "docopt",
             "future",
             "genson",
+            "hypothesis",
             "jsonschema",
+            "mock",
             "nltk",
             "numpy",
             "pandas",
             "pyopenssl",
-            "python-dateutil",
+            "pytest",
+            "pytest-cov",
             "requests",
             "scipy",
             "simplejson",
-            "singledispatch",
-            "six",
             "sklearn",
             "textblob",
             "tornado",
+            "twisted",
             "urllib3",
         ],
         entry_points={
@@ -97,20 +99,6 @@ def read(fname):
             ],
         },
         setup_requires=["pytest-runner"],
-        tests_require=[
-            "coverage",
-            "coveralls",
-            "hypothesis",
-            "mock",
-            "nltk",
-            "numpy",
-            "pandas",
-            "pytest",
-            "pytest-cov",
-            "scipy",
-            "sklearn",
-            "textblob",
-        ],
         test_suite="pytest",
     )
 

diff --git a/tabpy/tabpy_server/app/SettingsParameters.py b/tabpy/tabpy_server/app/SettingsParameters.py
diff --git a/tabpy/tabpy_server/app/app.py b/tabpy/tabpy_server/app/app.py
@@ -8,8 +8,7 @@
 import sys
 import tabpy
 from tabpy.tabpy import __version__
-from tabpy.tabpy_server.app.ConfigParameters import ConfigParameters
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app_parameters import ConfigParameters, SettingsParameters
 from tabpy.tabpy_server.app.util import parse_pwd_file
 from tabpy.tabpy_server.management.state import TabPyState
 from tabpy.tabpy_server.management.util import _get_state_from_file
@@ -136,9 +135,6 @@ def try_exit(self):
         _init_asyncio_patch()
         application = TabPyTornadoApp(
             [
-                # skip MainHandler to use StaticFileHandler .* page requests and
-                # default to index.html
-                # (r"/", MainHandler),
                 (
                     self.subdirectory + r"/query/([^/]+)",
                     QueryPlaneHandler,

diff --git a/tabpy/tabpy_server/app/ConfigParameters.py → tabpy/tabpy_server/app/app_parameters.py b/tabpy/tabpy_server/app/ConfigParameters.py → tabpy/tabpy_server/app/app_parameters.py
@@ -15,3 +15,22 @@ class ConfigParameters:
     TABPY_STATIC_PATH = "TABPY_STATIC_PATH"
     TABPY_MAX_REQUEST_SIZE_MB = "TABPY_MAX_REQUEST_SIZE_MB"
     TABPY_EVALUATE_TIMEOUT = "TABPY_EVALUATE_TIMEOUT"
+
+
+class SettingsParameters:
+    """
+    Application (TabPyApp) settings names
+    """
+
+    TransferProtocol = "transfer_protocol"
+    Port = "port"
+    ServerVersion = "server_version"
+    UploadDir = "upload_dir"
+    CertificateFile = "certificate_file"
+    KeyFile = "key_file"
+    StateFilePath = "state_file_path"
+    ApiVersions = "versions"
+    LogRequestContext = "log_request_context"
+    StaticPath = "static_path"
+    MaxRequestSizeInMb = "max_request_size_in_mb"
+    EvaluateTimeout = "evaluate_timeout"
diff --git a/tabpy/tabpy_server/handlers/__init__.py b/tabpy/tabpy_server/handlers/__init__.py
@@ -1,5 +1,4 @@
 from tabpy.tabpy_server.handlers.base_handler import BaseHandler
-from tabpy.tabpy_server.handlers.main_handler import MainHandler
 from tabpy.tabpy_server.handlers.management_handler import ManagementHandler
 
 from tabpy.tabpy_server.handlers.endpoint_handler import EndpointHandler

diff --git a/tabpy/tabpy_server/handlers/base_handler.py b/tabpy/tabpy_server/handlers/base_handler.py
@@ -4,7 +4,7 @@
 import json
 import logging
 import tornado.web
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app_parameters import SettingsParameters
 from tabpy.tabpy_server.handlers.util import hash_password
 from tabpy.tabpy_server.handlers.util import AuthErrorStates
 import uuid

diff --git a/tabpy/tabpy_server/handlers/main_handler.py b/tabpy/tabpy_server/handlers/main_handler.py
diff --git a/tabpy/tabpy_server/handlers/management_handler.py b/tabpy/tabpy_server/handlers/management_handler.py
@@ -6,8 +6,8 @@
 
 from tornado import gen
 
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
-from tabpy.tabpy_server.handlers import MainHandler
+from tabpy.tabpy_server.app.app_parameters import SettingsParameters
+from tabpy.tabpy_server.handlers import BaseHandler
 from tabpy.tabpy_server.handlers.base_handler import STAGING_THREAD
 from tabpy.tabpy_server.management.state import get_query_object_path
 from tabpy.tabpy_server.psws.callbacks import on_state_change
@@ -34,7 +34,7 @@ def copy_from_local(localpath, remotepath, is_dir=False):
         shutil.copy(localpath, remotepath)
 
 
-class ManagementHandler(MainHandler):
+class ManagementHandler(BaseHandler):
     def initialize(self, app):
         super(ManagementHandler, self).initialize(app)
         self.port = self.settings[SettingsParameters.Port]

diff --git a/tabpy/tabpy_server/handlers/service_info_handler.py b/tabpy/tabpy_server/handlers/service_info_handler.py
@@ -1,5 +1,5 @@
 import json
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app_parameters import SettingsParameters
 from tabpy.tabpy_server.handlers import ManagementHandler
 from tabpy.tabpy_server.handlers.util import AuthErrorStates
 

diff --git a/tabpy/tabpy_server/handlers/upload_destination_handler.py b/tabpy/tabpy_server/handlers/upload_destination_handler.py
@@ -1,4 +1,4 @@
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app_parameters import SettingsParameters
 from tabpy.tabpy_server.handlers import ManagementHandler
 import os
 from tabpy.tabpy_server.handlers.util import AuthErrorStates

diff --git a/tabpy/tabpy_server/management/util.py b/tabpy/tabpy_server/management/util.py
@@ -5,8 +5,7 @@
     from ConfigParser import ConfigParser as _ConfigParser
 except ImportError:
     from configparser import ConfigParser as _ConfigParser
-from tabpy.tabpy_server.app.ConfigParameters import ConfigParameters
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app_parameters import ConfigParameters, SettingsParameters
 
 
 def write_state_config(state, settings, logger=logging.getLogger(__name__)):

diff --git a/tabpy/tabpy_server/psws/callbacks.py b/tabpy/tabpy_server/psws/callbacks.py
@@ -1,5 +1,5 @@
 import logging
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app_parameters import SettingsParameters
 from tabpy.tabpy_server.common.messages import (
     LoadObject,
     DeleteObjects,

diff --git a/tests/unit/server_tests/test_service_info_handler.py b/tests/unit/server_tests/test_service_info_handler.py
@@ -2,7 +2,7 @@
 import json
 import os
 from tabpy.tabpy_server.app.app import TabPyApp
-from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app_parameters import SettingsParameters
 import tempfile
 from tornado.testing import AsyncHTTPTestCase