Merge pull request #259 from snok/sondrelg/remove-sonarqube

Drop sonarqube

Author: sondrelg

.github/workflows/testing.yml

@@ -95,11 +95,3 @@ jobs:
           file: ./coverage.xml
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
-      - name: Fix coverage file for sonarcloud
-        run: |
-          sed -i "s/<source>\/home\/runner\/work\/drf-openapi-tester\/drf-openapi-tester\//<source>/g" coverage.xml
-          cat coverage.xml
-      - uses: sonarsource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.pre-commit-config.yaml

@@ -1,12 +1,11 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 22.3.0
     hooks:
       - id: black
-        args: [ '--quiet' ]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: check-case-conflict
       - id: end-of-file-fixer
@@ -32,7 +31,7 @@ repos:
         ]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.30.0
+    rev: v2.32.0
     hooks:
       - id: pyupgrade
         args: [ "--py3-plus", "--py36-plus", "--py37-plus" ]
@@ -43,7 +42,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v0.930'
+    rev: 'v0.942'
     hooks:
       - id: mypy
         additional_dependencies:

openapi_tester/schema_tester.py

@@ -156,7 +156,7 @@ def get_response_schema_section(self, response: Response) -> dict[str, Any]:
             json_object = self.get_key_value(
                 content_object,
                 "application/json",
-                f"\n\nNo `application/json` responses documented for method: "
+                "\n\nNo `application/json` responses documented for method: "
                 f"{response_method}, path: {parameterized_path}",
             )
             return self.get_key_value(json_object, "schema")
@@ -165,8 +165,9 @@ def get_response_schema_section(self, response: Response) -> dict[str, Any]:
             raise UndocumentedSchemaSectionError(
                 UNDOCUMENTED_SCHEMA_SECTION_ERROR.format(
                     key="content",
-                    error_addon=f"\n\nNo `content` defined for this response: "
-                    f"{response_method}, path: {parameterized_path}",
+                    error_addon=(
+                        f"\n\nNo `content` defined for this response: {response_method}, path: {parameterized_path}"
+                    ),
                 )
             )
         return {}
@@ -246,7 +247,7 @@ def test_schema_section(
             raise DocumentationError(
                 f"{VALIDATE_NONE_ERROR}\n\n"
                 f"Reference: {reference}\n\n"
-                f"Hint: Return a valid type, or document the value as nullable"
+                "Hint: Return a valid type, or document the value as nullable"
             )
         schema_section = normalize_schema_section(schema_section)
         if "oneOf" in schema_section:
@@ -319,7 +320,7 @@ def test_openapi_object(
                 raise DocumentationError(
                     f"{VALIDATE_MISSING_RESPONSE_KEY_ERROR.format(missing_key=key)}\n\nReference: {reference}."
                     f"object:key:{key}\n\nHint: Remove the key from your"
-                    f" OpenAPI docs, or include it in your API response"
+                    " OpenAPI docs, or include it in your API response"
                 )
         for key in response_keys:
             self.test_key_casing(key, case_tester, ignore_case)
@@ -332,7 +333,7 @@ def test_openapi_object(
                 raise DocumentationError(
                     f"{VALIDATE_WRITE_ONLY_RESPONSE_KEY_ERROR.format(write_only_key=key)}\n\nReference: {reference}"
                     f".object:key:{key}\n\nHint: Remove the key from your API response, or remove the "
-                    f'"WriteOnly" restriction'
+                    '"WriteOnly" restriction'
                 )
         for key, value in data.items():
             if key in properties:

pyproject.toml

@@ -72,6 +72,8 @@ build-backend = "poetry.masonry.api"
 
 [tool.black]
 line-length = 120
+preview = true
+quiet = true
 include = '\.pyi?$'
 
 [tool.isort]

sonar-project.properties

@@ -36,7 +36,8 @@ def test_validate_min_properties_error(self):
     def test_validate_max_properties_error(self):
         message = validate_max_properties({"maxProperties": 1}, {"one": 1, "two": 2})
         assert (
-            message == "The number of properties in {'one': 1, 'two': 2} exceeds the"
+            message
+            == "The number of properties in {'one': 1, 'two': 2} exceeds the"
             " specified maximum number of properties of 1"
         )
 
@@ -111,7 +112,7 @@ def test_validate_format_error(self):
             ({"format": "uri"}, "not uri"),
             ({"format": "url"}, "not url"),
         ]
-        for (schema, data) in d:
+        for schema, data in d:
             message = validate_format(schema, data)
             assert message == f'''Expected: a "{schema['format']}" formatted value\n\nReceived: "{data}"'''
 
@@ -212,7 +213,7 @@ def test_any_of_error():
 
 def test_one_of_error():
     expected_error_message = (
-        "Expected data to match one and only one of the oneOf schema types; found 0 matches\n\n" "Reference: init.oneOf"
+        "Expected data to match one and only one of the oneOf schema types; found 0 matches\n\nReference: init.oneOf"
     )
     tester = SchemaTester()
     with pytest.raises(DocumentationError, match=expected_error_message):

tests/test_errors.py

@@ -201,8 +201,10 @@ def test_validate_response_failure_scenario_undocumented_content(client, monkeyp
     response = client.get(de_parameterized_path)
     with pytest.raises(
         UndocumentedSchemaSectionError,
-        match=f"Error: Unsuccessfully tried to index the OpenAPI schema by `content`. \n\n"
-        f"No `content` defined for this response: {method}, path: {parameterized_path}",
+        match=(
+            "Error: Unsuccessfully tried to index the OpenAPI schema by `content`. \n\n"
+            f"No `content` defined for this response: {method}, path: {parameterized_path}"
+        ),
     ):
         tester.validate_response(response)
 

tests/test_schema_tester.py

@@ -35,7 +35,7 @@ def iterate_schema(schema: dict) -> Generator[tuple[dict | None, Response | None
                     with suppress(KeyError):
                         if "content" in responses_object:
                             schema_section = responses_object["content"]["application/json"]["schema"]
-                        elif "schema" in responses_object:
+                        elif "schema" in responses_object:  # noqa: SIM908
                             schema_section = responses_object["schema"]
                     if schema_section:
                         response = response_factory(