Merge pull request #7 from Natim/add-isort

Add isort.

Author: olance

.pre-commit-config.yaml

@@ -0,0 +1,24 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-ast
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/psf/black
+    rev: 19.10b0
+    hooks:
+      - id: black
+
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.21
+    hooks:
+      - id: isort

Makefile

@@ -0,0 +1,58 @@
+VIRTUALENV = virtualenv --python=python3
+
+VENV := $(shell echo $${VIRTUAL_ENV-.venv})
+PYTHON = $(VENV)/bin/python
+
+INSTALL_STAMP = $(VENV)/.install.stamp
+DEV_STAMP = $(VENV)/.dev_env_installed.stamp
+TEMPDIR := $(shell mktemp -du)
+
+help:
+	@echo "Please use 'make <target>' where <target> is one of"
+	@echo "  format                      reformat code: black and isort"
+	@echo "  install                     install dependencies and prepare environment"
+	@echo "  install-dev                 install dependencies and everything needed to run tests"
+	@echo "  black                       run the black tool, which will automatically reformat the code"
+	@echo "  isort                       run the isort tool, which will automatically sort all of the imports"
+	@echo "  clean                       remove *.pyc files and __pycache__ directory"
+	@echo "  distclean                   remove *.egg-info files and *.egg, build and dist directories"
+	@echo "  maintainer-clean            remove the .tox and the .venv directories"
+	@echo "Check the Makefile to know exactly what each target is doing."
+
+virtualenv: $(PYTHON)
+$(PYTHON):
+	$(VIRTUALENV) $(VENV)
+
+install: $(INSTALL_STAMP)
+$(INSTALL_STAMP): $(PYTHON) setup.py requirements.txt
+	$(VENV)/bin/pip install -U pip
+	$(VENV)/bin/pip install -Ue . -c requirements.txt
+	touch $(INSTALL_STAMP)
+
+install-dev: $(INSTALL_STAMP) $(DEV_STAMP)
+$(DEV_STAMP): $(PYTHON) dev-requirements.txt
+	$(VENV)/bin/pip install -Ur dev-requirements.txt
+	touch $(DEV_STAMP)
+
+format: black isort
+
+black: install-dev
+	$(VENV)/bin/black setup.py alma
+
+isort: install-dev
+	$(VENV)/bin/isort --recursive setup.py alma
+
+build-requirements:
+	$(VIRTUALENV) $(TEMPDIR)
+	$(TEMPDIR)/bin/pip install -U pip
+	$(TEMPDIR)/bin/pip install -Ue .
+	$(TEMPDIR)/bin/pip freeze | grep -v -- '-e' > requirements.txt
+
+clean:
+	find . -name '__pycache__' -type d | xargs rm -fr
+
+distclean: clean
+	rm -fr *.egg *.egg-info/ dist/ build/
+
+maintainer-clean: distclean
+	rm -fr .venv/ .tox/

alma/__init__.py

@@ -1,8 +1,6 @@
-from . import endpoints
-from . import entities
-
-from .client import Client
+from . import endpoints, entities
 from .api_modes import ApiModes
+from .client import Client
 
 import pkg_resources
 

alma/endpoints/__init__.py

@@ -1,4 +1,4 @@
 from .base import Base
 from .merchants import Merchants
-from .payments import Payments
 from .orders import Orders
+from .payments import Payments

alma/endpoints/merchants.py

@@ -1,5 +1,5 @@
-from . import Base
 from ..entities import Merchant
+from . import Base
 
 
 class Merchants(Base):

alma/endpoints/orders.py

@@ -1,8 +1,8 @@
 from functools import partial
 
-from . import Base
 from ..entities import Order
 from ..paginated_results import PaginatedResults
+from . import Base
 
 
 class Orders(Base):

alma/endpoints/payments.py

@@ -1,9 +1,9 @@
 from functools import partial
-from typing import Union, List
+from typing import List, Union
 
-from . import Base
-from ..entities import Payment, Eligibility, Order
+from ..entities import Eligibility, Order, Payment
 from ..paginated_results import PaginatedResults
+from . import Base
 
 
 class Payments(Base):

alma/entities/__init__.py

@@ -3,5 +3,5 @@
 from .installment import Installment, InstallmentState
 from .merchant import Merchant
 from .order import Order
+from .payment import Payment, PaymentFraudType, PaymentState
 from .refund import Refund
-from .payment import Payment, PaymentState, PaymentFraudType

alma/paginated_results.py

@@ -1,4 +1,4 @@
-from collections.abc import Sequence, Iterable
+from collections.abc import Iterable, Sequence
 from typing import Callable, Type, Union
 
 from alma.entities import Base as BaseEntity

dev-requirements.txt

@@ -0,0 +1,2 @@
+black
+isort