Merge pull request #16 from alma/pre-commit

Check pre-commit on travis for pull-requests.

Author: Natim

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v3.2.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -14,23 +14,24 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
 
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+    rev: v5.4.2
     hooks:
       - id: isort
+        additional_dependencies:
+          - toml
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    rev: 3.8.3
     hooks:
       - id: flake8
         args: [--max-line-length=99]
-        language_version: python3.7
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v0.761'
+    rev: 'v0.782'
     hooks:
     -   id: mypy

.travis.yml

@@ -8,8 +8,16 @@ python:
 - 3.6
 - 3.7
 - 3.8
-matrix:
+jobs:
   fast_finish: true
   include:
   - python: 3.8
     env: TOXENV=flake8
+  - name: "Code checks"
+    if: type = pull_request
+    dist: bionic
+    language: python
+    python: 3.8
+    install: pip install pre-commit
+    script:
+      pre-commit run --all-files --show-diff-on-failure

alma/client.py

@@ -6,10 +6,10 @@
 from .api_modes import ApiModes
 from .context import Context
 from .credentials import (
-    MerchantIdCredentials,
     AlmaSessionCredentials,
     ApiKeyCredentials,
     Credentials,
+    MerchantIdCredentials,
 )
 from .version import __version__ as alma_version
 

alma/credentials/__init__.py

@@ -1,6 +1,6 @@
 # flake8: noqa
 
-from .base import Credentials
 from .alma_session import AlmaSessionCredentials
 from .api_key import ApiKeyCredentials
+from .base import Credentials
 from .merchant_id import MerchantIdCredentials

alma/credentials/alma_session.py

@@ -1,5 +1,5 @@
-from . import Credentials
 from .. import ApiModes
+from .base import Credentials
 
 
 class AlmaSessionCredentials(Credentials):

alma/credentials/api_key.py

@@ -1,5 +1,5 @@
-from . import Credentials
 from .. import ApiModes
+from .base import Credentials
 
 
 class ApiKeyCredentials(Credentials):

alma/credentials/merchant_id.py

@@ -1,5 +1,5 @@
-from . import Credentials
 from .. import ApiModes
+from .base import Credentials
 
 
 class MerchantIdCredentials(Credentials):

alma/endpoints/__init__.py

@@ -1,7 +1,7 @@
 # flake8: noqa
 
 from .base import Base
+from .exports import Exports
 from .merchants import Merchants
 from .orders import Orders
-from .exports import Exports
 from .payments import Payments

alma/entities/__init__.py

@@ -2,9 +2,9 @@
 
 from .base import Base
 from .eligibility import Eligibility
+from .export import Export, ExportFormat, ExportType
 from .installment import Installment, InstallmentState
 from .merchant import Merchant
 from .order import Order
 from .payment import Payment, PaymentFraudType, PaymentState
 from .refund import Refund
-from .export import Export, ExportType, ExportFormat

pyproject.toml

@@ -9,3 +9,12 @@ exclude = '''
   | .venv
 )/
 '''
+
+[tool.isort]
+force_grid_wrap = false
+include_trailing_comma = true
+line_length = 99
+multi_line_output = 3
+skip_glob = ''
+use_parentheses = true
+combine_as_imports = true