Update pre-commit and isort

Author: hugovk

.pre-commit-config.yaml

@@ -11,17 +11,17 @@ repos:
       - id: black
         args: ["--target-version", "py36"]
 
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.6.4
+    hooks:
+      - id: isort
+
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.8.4
     hooks:
       - id: flake8
         additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
 
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.6.4
-    hooks:
-      - id: isort
-
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.7.0
     hooks:
@@ -33,6 +33,7 @@ repos:
       - id: check-merge-conflict
       - id: check-toml
       - id: check-yaml
+      - id: end-of-file-fixer
 
   - repo: https://github.com/PyCQA/pydocstyle
     rev: 5.1.1
@@ -41,6 +42,11 @@ repos:
         args: ["--convention", "google"]
         files: "src/"
 
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: 0.5.0
+    hooks:
+      - id: tox-ini-fmt
+
   - repo: https://github.com/asottile/setup-cfg-fmt
     rev: v1.15.1
     hooks:

setup.cfg

@@ -56,12 +56,7 @@ max_line_length = 88
 convention = google
 
 [tool:isort]
-known_third_party = freezegun,humanize,pkg_resources,pytest,setuptools
-force_grid_wrap = 0
-include_trailing_comma = True
-line_length = 88
-multi_line_output = 3
-use_parentheses = True
+profile = black
 
 [tool:pytest]
 addopts = --color=yes

src/humanize/__init__.py

@@ -1,5 +1,6 @@
 """Main package for humanize."""
 import pkg_resources
+
 from humanize.filesize import naturalsize
 from humanize.i18n import activate, deactivate, thousands_separator
 from humanize.number import apnumber, fractional, intcomma, intword, ordinal, scientific

tests/test_filesize.py

@@ -2,9 +2,10 @@
 
 """Tests for filesize humanizing."""
 
-import humanize
 import pytest
 
+import humanize
+
 
 @pytest.mark.parametrize(
     "test_args, expected",

tests/test_i18n.py

@@ -1,9 +1,10 @@
 import datetime as dt
 import importlib
 
-import humanize
 import pytest
 
+import humanize
+
 
 def test_i18n():
     three_seconds = dt.timedelta(seconds=3)

tests/test_number.py

@@ -2,8 +2,9 @@
 
 """Number tests."""
 
-import humanize
 import pytest
+
+import humanize
 from humanize import number
 
 

tests/test_time.py

@@ -4,9 +4,10 @@
 
 import datetime as dt
 
-import humanize
 import pytest
 from freezegun import freeze_time
+
+import humanize
 from humanize import time
 
 ONE_DAY_DELTA = dt.timedelta(days=1)

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36, 37, 38, 39, py3}
+    py{py3, 39, 38, 37, 36}
 
 [testenv]
 extras =
@@ -9,14 +9,19 @@ commands =
     {envpython} -m pytest --cov humanize --cov tests --cov-report xml {posargs}
 
 [testenv:docs]
-deps = -r docs/requirements.txt
-commands = mkdocs build
+deps =
+    -r
+commands =
+    mkdocs build
 
 [testenv:lint]
-deps = pre-commit
-commands = pre-commit run --all-files --show-diff-on-failure
+passenv =
+    PRE_COMMIT_COLOR
 skip_install = true
-passenv = PRE_COMMIT_COLOR
+deps =
+    pre-commit
+commands =
+    pre-commit run --all-files --show-diff-on-failure
 
 [pytest]
-addopts = --doctest-modules
+addopts = --doctest-modules