Merge pull request #351 from mik-laj/pyupgrade

Enforce latests syntax on CI

Author: p1c2u

.github/workflows/python-test.yml

@@ -10,6 +10,7 @@ on:
 
 jobs:
   test:
+    name: "Tests"
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -31,3 +32,16 @@ jobs:
       run: python setup.py test
     - name: Upload coverage
       uses: codecov/codecov-action@v1
+
+  static-checks:
+    name: "Static checks"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
+        uses: actions/checkout@v2
+      - name: "Setup Python"
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: "Run static checks"
+        uses: pre-commit/[email protected]

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+---
+default_stages: [commit, push]
+default_language_version:
+  # force all unspecified python hooks to run python3
+  python: python3
+minimum_pre_commit_version: "1.20.0"
+repos:
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.19.0
+    hooks:
+      - id: pyupgrade
+        args: ["--py36-plus"]
+  - repo: local
+    hooks:
+      - id: flynt
+        name: Convert to f-strings with flynt
+        entry: flynt
+        language: python
+        additional_dependencies: ['flynt==0.64']

CONTRIBUTING.md

@@ -0,0 +1,28 @@
+
+Contributor Guide
+=================
+
+# Static checks
+
+The project uses static checks using fantastic [pre-commit](https://pre-commit.com/). Every change is checked on CI and if it does not pass the tests it cannot be accepted. If you want to check locally then run following command to install pre-commit:
+
+```bash
+pip install -r requiremenets_dev.txt
+```
+
+To turn on pre-commit checks for commit operations in git, enter:
+```bash
+pre-commit install
+```
+
+To run all checks on your staged files, enter:
+```bash
+pre-commit run
+```
+
+To run all checks on all files, enter:
+```bash
+pre-commit run --all-files
+```
+
+Pre-commit check results are also attached to your PR through integration with Github Action.

openapi_core/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """OpenAPI core module"""
 from openapi_core.shortcuts import (
     create_spec, validate_request, validate_response,

openapi_core/casting/schemas/exceptions.py

@@ -10,5 +10,4 @@ class CastError(OpenAPIError):
     type: str
 
     def __str__(self):
-        return "Failed to cast value to {type} type: {value}".format(
-            type=self.type, value=self.value)
+        return f"Failed to cast value to {self.type} type: {self.value}"

openapi_core/contrib/django/backports.py

@@ -24,4 +24,4 @@ def parse_header_name(cls, header):
 
 
 def request_current_scheme_host(req):
-    return '{}://{}'.format(req.scheme, req.get_host())
+    return f'{req.scheme}://{req.get_host()}'

openapi_core/deserializing/media_types/util.py

@@ -11,10 +11,8 @@ def data_form_loads(value):
         value = value.decode('ASCII', errors='surrogateescape')
     parser = Parser()
     parts = parser.parsestr(value, headersonly=False)
-    return dict(
-        (
-            part.get_param('name', header='content-disposition'),
-            part.get_payload(decode=True),
-        )
+    return {
+        part.get_param('name', header='content-disposition'):
+        part.get_payload(decode=True)
         for part in parts.get_payload()
-    )
+    }

openapi_core/deserializing/parameters/exceptions.py

@@ -17,9 +17,9 @@ class ParameterDeserializeError(BaseParameterDeserializeError):
 
     def __str__(self):
         return (
-            "Failed to deserialize value "
-            "of {location} parameter with style {style}: {value}"
-        ).format(location=self.location, style=self.style, value=self.value)
+            "Failed to deserialize value of "
+            f"{self.location} parameter with style {self.style}: {self.value}"
+        )
 
 
 @dataclass(init=False)
@@ -31,5 +31,6 @@ def __init__(self, name):
         self.name = name
 
     def __str__(self):
-        return "Value of {name} {location} parameter cannot be empty".format(
-            name=self.name, location=self.location)
+        return (
+            f"Value of {self.name} {self.location} parameter cannot be empty"
+        )

openapi_core/exceptions.py

@@ -23,16 +23,15 @@ class MissingHeader(MissingHeaderError):
     name: str
 
     def __str__(self):
-        return "Missing header (without default value): {0}".format(
-            self.name)
+        return f"Missing header (without default value): {self.name}"
 
 
 @dataclass
 class MissingRequiredHeader(MissingHeaderError):
     name: str
 
     def __str__(self):
-        return "Missing required header: {0}".format(self.name)
+        return f"Missing required header: {self.name}"
 
 
 class OpenAPIParameterError(OpenAPIError):
@@ -49,16 +48,15 @@ class MissingParameter(MissingParameterError):
     name: str
 
     def __str__(self):
-        return "Missing parameter (without default value): {0}".format(
-            self.name)
+        return f"Missing parameter (without default value): {self.name}"
 
 
 @dataclass
 class MissingRequiredParameter(MissingParameterError):
     name: str
 
     def __str__(self):
-        return "Missing required parameter: {0}".format(self.name)
+        return f"Missing required parameter: {self.name}"
 
 
 class OpenAPIRequestBodyError(OpenAPIError):

openapi_core/security/providers.py

@@ -40,6 +40,6 @@ def __call__(self, request):
         scheme = self.scheme['scheme']
         if auth_type.lower() != scheme:
             raise SecurityError(
-                'Unknown authorization method %s' % auth_type)
+                f'Unknown authorization method {auth_type}')
 
         return encoded_credentials