Merge pull request #1286 from VWS-Python/bump-reqs

Bump isort

Author: adamtheturtle

Makefile

@@ -24,14 +24,10 @@ lint: \
     yapf
 
 .PHONY: fix-lint
-fix-lint:
-	# Move imports to a single line so that autoflake can handle them.
-	# See https://github.com/myint/autoflake/issues/8.
-	# Then later we put them back.
-	isort --force-single-line --recursive --apply
-	$(MAKE) autoflake
-	$(MAKE) fix-yapf
-	isort --recursive --apply
+fix-lint: \
+    autoflake \
+    fix-yapf \
+    fix-isort
 
 .PHONY: docs
 docs:

dev-requirements.txt

@@ -14,13 +14,13 @@ flake8-commas==2.0.0  # Require silicon valley commas
 flake8-quotes==3.2.0  # Require single quotes
 flake8==3.8.3  # Lint
 freezegun==0.3.15
-isort==4.3.21  # Lint imports
+isort==5.4.2  # Lint imports
 mypy==0.782  # Type checking
 pip_check_reqs==2.1.1
 pydocstyle==5.1.0  # Lint docstrings
 pyenchant==3.1.1  # Bindings for a spellchecking sytem
 pygithub==1.53
-pylint==2.5.3  # Lint
+pylint==2.6.0  # Lint
 pyroma==2.6  # Packaging best practices checker
 pytest-cov==2.10.1  # Measure code coverage
 pytest==6.0.1  # Test runners

lint.mk

@@ -36,7 +36,11 @@ flake8:
 
 .PHONY: isort
 isort:
-	isort --recursive --check-only
+	isort --check-only .
+
+.PHONY: fix-isort
+fix-isort:
+	isort .
 
 .PHONY: pip-extra-reqs
 pip-extra-reqs:

src/vws/vws.py

@@ -338,8 +338,8 @@ def decorated() -> None:
 
         try:
             decorated()
-        except FunctionTimedOut:
-            raise TargetProcessingTimeout
+        except FunctionTimedOut as exc:
+            raise TargetProcessingTimeout from exc
 
     def list_targets(self) -> List[str]:
         """