Merge pull request #494 from adamtheturtle/commas

Commas

Author: adamtheturtle

ci/run_script.py

@@ -22,7 +22,7 @@ def run_test(test_filename: str) -> None:
             str(path),
             '--cov=src',
             '--cov=tests',
-        ]
+        ],
     )
     sys.exit(result)
 

dev-requirements.txt

@@ -3,6 +3,7 @@ check-manifest==0.36
 codecov==2.0.15 # Upload coverage data
 dodgy==0.1.9  # Look for uploaded secrets
 flake8==3.5.0  # Lint
+flake8-commas==2.0.0  # Require silicon valley commas
 flake8-quotes==0.14.0  # Require single quotes
 freezegun==0.3.10  # Freeze time in tests
 hypothesis==3.50.2  # Generate test cases

src/mock_vws/_mock_web_query_api.py

@@ -48,7 +48,7 @@ def decorator(method: Callable[..., str]) -> Callable[..., str]:
                 route_name=method.__name__,
                 path_pattern=path_pattern,
                 http_methods=http_methods,
-            )
+            ),
         )
 
         return method

src/mock_vws/_mock_web_services_api.py

@@ -97,7 +97,7 @@ def set_content_length_header(
     wrapped: Callable[..., str],
     instance: 'MockVuforiaWebServicesAPI',  # pylint: disable=unused-argument
     args: Tuple[_RequestObjectProxy, _Context],
-    kwargs: Dict
+    kwargs: Dict,
 ) -> str:
     """
     Set the `Content-Length` header.
@@ -155,7 +155,7 @@ def decorator(method: Callable[..., str]) -> Callable[..., str]:
                 route_name=method.__name__,
                 path_pattern=path_pattern,
                 http_methods=http_methods,
-            )
+            ),
         )
 
         key_validator = validate_keys(
@@ -287,7 +287,7 @@ def status(self) -> str:
         target is for detection.
         """
         processing_time = datetime.timedelta(
-            seconds=self._processing_time_seconds
+            seconds=self._processing_time_seconds,
         )
 
         time_since_change = datetime.datetime.now() - self.last_modified_date
@@ -312,7 +312,7 @@ def tracking_rating(self) -> int:
         pre_rating_time = datetime.timedelta(
             # That this is half of the total processing time is unrealistic.
             # In VWS it is not a constant percentage.
-            seconds=self._processing_time_seconds / 2
+            seconds=self._processing_time_seconds / 2,
         )
 
         time_since_upload = datetime.datetime.now() - self.upload_date
@@ -474,29 +474,29 @@ def database_summary(
                 target for target in self.targets
                 if target.status == TargetStatuses.SUCCESS.value
                 and target.active_flag
-            ]
+            ],
         )
 
         failed_images = len(
             [
                 target for target in self.targets
                 if target.status == TargetStatuses.FAILED.value
-            ]
+            ],
         )
 
         inactive_images = len(
             [
                 target for target in self.targets
                 if target.status == TargetStatuses.SUCCESS.value
                 and not target.active_flag
-            ]
+            ],
         )
 
         processing_images = len(
             [
                 target for target in self.targets
                 if target.status == TargetStatuses.PROCESSING.value
-            ]
+            ],
         )
 
         body = {

src/mock_vws/_validators.py

@@ -41,7 +41,7 @@ def authorization_header(  # pylint: disable=too-many-arguments
     content: bytes,
     content_type: str,
     date: str,
-    request_path: str
+    request_path: str,
 ) -> bytes:
     """
     Return an `Authorization` header which can be used for a request made to

tests/mock_vws/conftest.py

@@ -168,13 +168,13 @@ def verify_mock_vuforia_inactive(
         '_target_list',
         '_target_summary',
         '_update_target',
-    ]
+    ],
 )
 def endpoint(request: SubRequest) -> TargetAPIEndpoint:
     """
     Return details of an endpoint.
     """
     endpoint_fixture: TargetAPIEndpoint = request.getfixturevalue(
-        request.param
+        request.param,
     )
     return endpoint_fixture

tests/mock_vws/test_add_target.py

@@ -60,7 +60,7 @@ class TestContentTypes:
             'Documented Content-Type',
             'Undocumented Content-Type',
             'Empty',
-        ]
+        ],
     )
     def test_content_types(
         self,
@@ -203,7 +203,8 @@ class TestTargetName:
         'name', [
             'a',
             'a' * 64,
-        ], ids=['Short name', 'Long name']
+        ],
+        ids=['Short name', 'Long name'],
     )
     def test_name_valid(
         self,

tests/mock_vws/test_database_summary.py

@@ -93,7 +93,7 @@ def test_success(
         It is possible to get a success response.
         """
         response = database_summary(
-            vuforia_database_keys=vuforia_database_keys
+            vuforia_database_keys=vuforia_database_keys,
         )
 
         assert_vws_response(

tests/mock_vws/test_target_summary.py

@@ -47,7 +47,7 @@ def test_target_summary(
                 'name': name,
                 'width': 1,
                 'image': image_data_encoded,
-            }
+            },
         )
 
         target_id = target_response.json()['target_id']
@@ -116,7 +116,7 @@ def test_after_processing(
                 'name': 'example',
                 'width': 1,
                 'image': image_data_encoded,
-            }
+            },
         )
 
         target_id = target_response.json()['target_id']
@@ -170,7 +170,7 @@ def test_active_flag(
                 'width': 1,
                 'image': image_data_encoded,
                 'active_flag': active_flag,
-            }
+            },
         )
 
         response = target_api_request(

tests/mock_vws/test_update_target.py

@@ -41,7 +41,7 @@ class TestUpdate:
             'Documented Content-Type',
             'Undocumented Content-Type',
             'Empty',
-        ]
+        ],
     )
     def test_content_types(
         self,
@@ -72,7 +72,7 @@ def test_content_types(
             vuforia_database_keys=vuforia_database_keys,
             data={'name': 'Adam'},
             target_id=target_id,
-            content_type=content_type
+            content_type=content_type,
         )
 
         # Code is FORBIDDEN because the target is processing.
@@ -441,7 +441,8 @@ class TestTargetName:
         'name', [
             'a',
             'a' * 64,
-        ], ids=['Short name', 'Long name']
+        ],
+        ids=['Short name', 'Long name'],
     )
     def test_name_valid(
         self,