From 8fce5f9f5bdb5430344da60202e5b71a9b3a0063 Mon Sep 17 00:00:00 2001 From: John Reese Date: Sun, 8 Nov 2020 12:49:07 -0800 Subject: [PATCH] Upgrade flit, switch from isort to usort --- aioitertools/tests/asyncio.py | 1 - aioitertools/tests/builtins.py | 1 - aioitertools/tests/itertools.py | 1 - aioitertools/tests/more_itertools.py | 1 - makefile | 4 ++-- requirements-dev.txt | 4 ++-- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/aioitertools/tests/asyncio.py b/aioitertools/tests/asyncio.py index b89f9a9..ecb50d0 100644 --- a/aioitertools/tests/asyncio.py +++ b/aioitertools/tests/asyncio.py @@ -6,7 +6,6 @@ from unittest import TestCase import aioitertools as ait import aioitertools.asyncio as aio - from .helpers import async_test slist = ["A", "B", "C"] diff --git a/aioitertools/tests/builtins.py b/aioitertools/tests/builtins.py index 105445f..e2c766f 100644 --- a/aioitertools/tests/builtins.py +++ b/aioitertools/tests/builtins.py @@ -6,7 +6,6 @@ from typing import AsyncIterator from unittest import TestCase import aioitertools as ait - from .helpers import async_test slist = ["A", "B", "C"] diff --git a/aioitertools/tests/itertools.py b/aioitertools/tests/itertools.py index bf0a0bb..e1f6bb2 100644 --- a/aioitertools/tests/itertools.py +++ b/aioitertools/tests/itertools.py @@ -6,7 +6,6 @@ import operator from unittest import TestCase import aioitertools as ait - from .helpers import async_test slist = ["A", "B", "C"] diff --git a/aioitertools/tests/more_itertools.py b/aioitertools/tests/more_itertools.py index ad3b39e..7a7b58e 100644 --- a/aioitertools/tests/more_itertools.py +++ b/aioitertools/tests/more_itertools.py @@ -5,7 +5,6 @@ from typing import AsyncIterable from unittest import TestCase import aioitertools.more_itertools as mit - from .helpers import async_test diff --git a/makefile b/makefile index 6a001ec..0eaaf41 100644 --- a/makefile +++ b/makefile @@ -18,12 +18,12 @@ release: lint test clean flit publish format: - python -m isort --apply --recursive aioitertools + python -m usort format aioitertools python -m black aioitertools lint: python -m pylint --rcfile .pylint aioitertools - python -m isort --diff --recursive aioitertools + python -m usort check aioitertools python -m black --check aioitertools test: diff --git a/requirements-dev.txt b/requirements-dev.txt index 05a2d06..a7cafac 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,9 @@ black==19.10b0 codecov==2.0.22 coverage[toml]==5.1 -flit==2.3.0 -isort==4.3.20 +flit==3.0.0 mypy==0.790 pylint==2.4.4 sphinx==3.3.0 +usort==0.6.0 git+https://github.com/miyakogi/m2r \ No newline at end of file