fix linting, skip macos tests

python-arq · Apr 26, 2021 · 82fff7a · 82fff7a
1 parent 8f598b4
commit 82fff7a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, macos]
+        os: [ubuntu]
         python-version: ['3.6', '3.7', '3.8', '3.9']
 
     env:

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 .DEFAULT_GOAL := all
-isort = isort -rc arq tests
+isort = isort arq tests
 black = black -S -l 120 --target-version py37 arq tests
 
 .PHONY: install
@@ -16,7 +16,7 @@ format:
 .PHONY: lint
 lint:
 	flake8 arq/ tests/
-	$(isort) --check-only -df
+	$(isort) --check-only --df
 	$(black) --check
 
 .PHONY: test

diff --git a/arq/typing.py b/arq/typing.py
@@ -3,9 +3,9 @@
 from typing import TYPE_CHECKING, Any, Dict, Optional, Sequence, Set, Type, Union
 
 if sys.version_info >= (3, 8):
-    from typing import Protocol, Literal
+    from typing import Literal, Protocol
 else:
-    from typing_extensions import Protocol, Literal
+    from typing_extensions import Literal, Protocol
 
 __all__ = (
     'OptionType',
@@ -19,8 +19,8 @@
 
 
 if TYPE_CHECKING:
-    from .worker import Function  # noqa F401
     from .cron import CronJob  # noqa F401
+    from .worker import Function  # noqa F401
 
 OptionType = Union[None, Set[int], int]
 WEEKDAYS = 'mon', 'tues', 'wed', 'thurs', 'fri', 'sat', 'sun'

diff --git a/setup.cfg b/setup.cfg
@@ -25,7 +25,7 @@ exclude_lines =
 
 [isort]
 line_length=120
-known_standard_library=dataclasses
+known_third_party=pytest
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0

diff --git a/tests/requirements-linting.txt b/tests/requirements-linting.txt
@@ -1,7 +1,7 @@
 black==19.10b0
 flake8==3.7.9
 flake8-quotes==3
-isort==4.3.21
+isort==5.8.0
 mypy==0.812
 pycodestyle==2.5.0
 pyflakes==2.1.1