Fix typehint-remover and enforce black (#162)

* Run typehint-remover before running tests * Update type_hint_remover to use strip-hints package * Run new type_hint_remover in Jenkins * Require python version >= 3.5 * Remove unnecessary class scope variables in v06 dtos * Simplify type_hint_remover * Enforce black (#163) * Bump version to 0.11.19
cognitedata · Nov 27, 2018 · 21f950f · 21f950f
1 parent d184d7c
commit 21f950f
Show file tree

Hide file tree

Showing 30 changed files with 400 additions and 461 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,6 @@
+repos:
+- repo: https://github.com/cognitedata/python-pre-commit-hooks
+  rev: e2944b2
+  hooks:
+  - id: isort
+  - id: black
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -49,6 +49,11 @@ podTemplate(
             stage('Install dependencies') {
                 sh("pipenv sync --dev")
             }
+            stage('Check code style & remove typehints') {
+                sh("pipenv run black -l 120 --check .")
+                sh("pipenv run python3 type_hint_remover.py")
+                sh("pipenv run python3 -m black ./cognite -l 120")
+            }
             stage('Test and coverage report') {
                 sh("pipenv run pytest --cov-report xml:coverage.xml --cov=cognite --junitxml=test-report.xml || true")
                 junit(allowEmptyResults: true, testResults: '**/test-report.xml')
@@ -59,8 +64,6 @@ podTemplate(
                 step([$class: 'CoberturaPublisher', coberturaReportFile: 'coverage.xml'])
             }
             stage('Build') {
-                sh("pipenv run python3 code_parser.py --remove-type-hints --suppress-warning")
-                sh("pipenv run python3 -m black ./cognite -l 120")
                 sh("python3 setup.py sdist")
                 sh("python3 setup.py bdist_wheel")
             }

diff --git a/Pipfile b/Pipfile
@@ -20,7 +20,9 @@ twine = "*"
 pytest = "*"
 pylint = "*"
 astunparse = "*"
-black = "*"
+black = "==18.6b4"
+strip-hints = "*"
+pre-commit = "*"
 
 [requires]
 python_version = "3.6"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/code_parser.py b/code_parser.py
diff --git a/cognite/__init__.py b/cognite/__init__.py
@@ -18,4 +18,4 @@
 #
 
 __all__ = ["v04", "v05", "v06", "preprocessing", "config", "data_transfer_service"]
-__version__ = "0.11.18"
+__version__ = "0.11.19"
diff --git a/cognite/_utils.py b/cognite/_utils.py
@@ -32,6 +32,7 @@ def serialize(obj):
     """JSON serializer for objects not serializable by default json code"""
     return obj.__dict__
 
+
 def _raise_API_error(res):
     x_request_id = res.headers.get("X-Request-Id")
     code = res.status_code

diff --git a/cognite/auxiliary/_hosting/model/model/model.py b/cognite/auxiliary/_hosting/model/model/model.py
@@ -2,6 +2,7 @@
 
 from cognite.data_transfer_service import DataTransferService
 
+
 class Model:
     def __init__(self, model):
         self._model = model

diff --git a/cognite/v04/raw.py b/cognite/v04/raw.py
@@ -228,9 +228,7 @@ def create_rows(
 
     """
     api_key, project = config.get_config_variables(api_key, project)
-    url = config.get_base_url() + "/api/0.4/projects/{}/raw/{}/{}/create".format(
-        project, database_name, table_name
-    )
+    url = config.get_base_url() + "/api/0.4/projects/{}/raw/{}/{}/create".format(project, database_name, table_name)
 
     headers = {"api-key": api_key, "content-type": "*/*", "accept": "application/json"}
     if ensure_parent:
@@ -270,9 +268,7 @@ def delete_rows(
 
     """
     api_key, project = config.get_config_variables(api_key, project)
-    url = config.get_base_url() + "/api/0.4/projects/{}/raw/{}/{}/delete".format(
-        project, database_name, table_name
-    )
+    url = config.get_base_url() + "/api/0.4/projects/{}/raw/{}/{}/delete".format(project, database_name, table_name)
     body = {"items": [{"key": "{}".format(row.key), "columns": row.columns} for row in rows]}
     headers = {"api-key": api_key, "content-type": "*/*", "accept": "application/json"}
     res = _utils.post_request(url=url, body=body, headers=headers, cookies=config.get_cookies())

diff --git a/cognite/v04/timeseries.py b/cognite/v04/timeseries.py
@@ -152,9 +152,7 @@ def _get_datapoints_helper(tag_id, aggregates=None, granularity=None, start=None
         list of datapoints: A list containing datapoint dicts.
     """
     api_key, project = kwargs.get("api_key"), kwargs.get("project")
-    url = config.get_base_url() + "/api/0.4/projects/{}/timeseries/data/{}".format(
-        project, quote(tag_id, safe="")
-    )
+    url = config.get_base_url() + "/api/0.4/projects/{}/timeseries/data/{}".format(project, quote(tag_id, safe=""))
 
     use_protobuf = kwargs.get("protobuf", True) and aggregates is None
     limit = _constants.LIMIT if aggregates is None else _constants.LIMIT_AGG
@@ -274,9 +272,7 @@ def post_datapoints(tag_id, datapoints: List[Datapoint], **kwargs):
         An empty response.
     """
     api_key, project = config.get_config_variables(kwargs.get("api_key"), kwargs.get("project"))
-    url = config.get_base_url() + "/api/0.4/projects/{}/timeseries/data/{}".format(
-        project, quote(tag_id, safe="")
-    )
+    url = config.get_base_url() + "/api/0.4/projects/{}/timeseries/data/{}".format(project, quote(tag_id, safe=""))
 
     headers = {"api-key": api_key, "content-type": "application/json", "accept": "application/json"}
 
@@ -305,9 +301,7 @@ def get_latest(tag_id, **kwargs):
         output formats.
     """
     api_key, project = config.get_config_variables(kwargs.get("api_key"), kwargs.get("project"))
-    url = config.get_base_url() + "/api/0.4/projects/{}/timeseries/latest/{}".format(
-        project, quote(tag_id, safe="")
-    )
+    url = config.get_base_url() + "/api/0.4/projects/{}/timeseries/latest/{}".format(project, quote(tag_id, safe=""))
     headers = {"api-key": api_key, "accept": "application/json"}
     res = _utils.get_request(url, headers=headers, cookies=config.get_cookies())
     return LatestDatapointResponse(res.json())

diff --git a/cognite/v05/raw.py b/cognite/v05/raw.py
@@ -228,9 +228,7 @@ def create_rows(
 
     """
     api_key, project = config.get_config_variables(api_key, project)
-    url = config.get_base_url() + "/api/0.5/projects/{}/raw/{}/{}/create".format(
-        project, database_name, table_name
-    )
+    url = config.get_base_url() + "/api/0.5/projects/{}/raw/{}/{}/create".format(project, database_name, table_name)
 
     headers = {"api-key": api_key, "content-type": "*/*", "accept": "application/json"}
     if ensure_parent:
@@ -270,9 +268,7 @@ def delete_rows(
 
     """
     api_key, project = config.get_config_variables(api_key, project)
-    url = config.get_base_url() + "/api/0.5/projects/{}/raw/{}/{}/delete".format(
-        project, database_name, table_name
-    )
+    url = config.get_base_url() + "/api/0.5/projects/{}/raw/{}/{}/delete".format(project, database_name, table_name)
     body = {"items": [{"key": "{}".format(row.key), "columns": row.columns} for row in rows]}
     headers = {"api-key": api_key, "content-type": "*/*", "accept": "application/json"}
     res = _utils.post_request(url=url, body=body, headers=headers, cookies=config.get_cookies())