restyled everything

igorcoding · Aug 12, 2023 · ee0d628 · ee0d628
1 parent 493784d
commit ee0d628
Show file tree

Hide file tree

Showing 71 changed files with 2,259 additions and 2,182 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
@@ -46,7 +46,7 @@ jobs:
               make clean && make debug && make coverage
               # coveralls
           else
-              make build && make quicktest
+              make build && make lint && make quicktest
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,12 +6,15 @@
 
 **New features:**
 * Added building wheels for Python 3.11 and 3.12
-* Upgraded to Cython 3.0.0
-* Using pyproject.toml for building spec
 
 **Bug fixes:**
 * Fixed an issue with encoding of update operations as tuples on PyPy
 
+**Other changes**
+* Upgraded to Cython 3.0.0
+* Using pyproject.toml for building spec
+* Using black, isort & ruff for linting
+
 ## v2.0.1
 * Fixed an issue with encoding datetimes less than 01-01-1970 (fixes [#29](https://github.com/igorcoding/asynctnt/issues/29))
 * Fixed "Edit on Github" links in docs (fixes [#26](https://github.com/igorcoding/asynctnt/issues/26))

diff --git a/Makefile b/Makefile
@@ -1,12 +1,9 @@
-.PHONY: build debug test coverage clean annotate all style local
-
+.PHONY: clean build local debug annotate dist docs style mypy ruff style-check lint test quicktest coverage
 
 PYTHON?=python
 
-
 all: local
 
-
 clean:
 	pip uninstall -y asynctnt
 	rm -rf asynctnt/*.c asynctnt/*.h asynctnt/*.cpp
@@ -34,20 +31,6 @@ debug: clean
 annotate:
 	cython -3 -a asynctnt/iproto/protocol.pyx
 
-
-test:
-	PYTHONASYNCIODEBUG=1 $(PYTHON) -m pytest
-	$(PYTHON) -m pytest
-	USE_UVLOOP=1 $(PYTHON) -m pytest
-
-quicktest:
-	$(PYTHON) -m pytest
-
-coverage:
-	$(PYTHON) -m pytest --cov
-	./scripts/run_until_success.sh $(PYTHON) -m coverage report -m
-	./scripts/run_until_success.sh $(PYTHON) -m coverage html
-
 dist:
 	$(PYTHON) -m build .
 
@@ -69,3 +52,16 @@ style-check:
 	$(PYTHON) -m isort --check --diff .
 
 lint: style-check ruff
+
+test: lint
+	PYTHONASYNCIODEBUG=1 $(PYTHON) -m pytest
+	$(PYTHON) -m pytest
+	USE_UVLOOP=1 $(PYTHON) -m pytest
+
+quicktest:
+	$(PYTHON) -m pytest
+
+coverage:
+	$(PYTHON) -m pytest --cov
+	./scripts/run_until_success.sh $(PYTHON) -m coverage report -m
+	./scripts/run_until_success.sh $(PYTHON) -m coverage html
diff --git a/asynctnt/__init__.py b/asynctnt/__init__.py
@@ -2,9 +2,18 @@
 
 from .connection import Connection, connect
 from .iproto.protocol import (
-    Iterator, Response, TarantoolTuple, PushIterator,
-    Schema, SchemaSpace, SchemaIndex, Metadata, Field,
-    Db, IProtoError, IProtoErrorStackFrame
+    Db,
+    Field,
+    IProtoError,
+    IProtoErrorStackFrame,
+    Iterator,
+    Metadata,
+    PushIterator,
+    Response,
+    Schema,
+    SchemaIndex,
+    SchemaSpace,
+    TarantoolTuple,
 )
 
-__version__ = '2.1.0'
+__version__ = "2.1.0"