Tooling updates: black, isort, flake8

isort v4.x doesn't have the ability to inline control certain sorting
constructs, necessary for making tooling that's less sensitive to its
execution path. flake8 is updated since it seems likely it was going to
be updated soon given that with this commit 2/3 of the pre-commit hooks
would have been updated.

.isort.cfg

@@ -4,4 +4,4 @@ include_trailing_comma=True
 force_grid_wrap=0
 use_parentheses=True
 line_length=88
-known_third_party = appdirs,autopkgcmd,autopkglib,certifi,grp,pwd,xattr
+known_third_party = appdirs,certifi,grp,pwd,xattr

.pre-commit-config.yaml

@@ -4,14 +4,17 @@ repos:
     hooks:
     - id: black
 -   repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21  # Use the revision sha / tag you want to point at
+    rev: v5.0.4  # Use the revision sha / tag you want to point at
     hooks:
     - id: isort
 -   repo: https://github.com/asottile/seed-isort-config
-    rev: v1.9.3
+    rev: v2.2.0
     hooks:
     -   id: seed-isort-config
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0  # Use the ref you want to point at
+        # Prevent listing autopkg code as 'third-party'
+        # https://github.com/asottile/seed-isort-config#usage-with-pre-commit
+        args: [--application-directories=Code]
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.3  # Use the ref you want to point at
     hooks:
     - id: flake8

Code/autopkglib/PkgCreator.py

@@ -19,7 +19,7 @@ import os.path
 import plistlib
 import socket
 import subprocess
-import xml.etree.ElementTree as ET
+from xml.etree import ElementTree as ET
 
 from autopkglib import Processor, ProcessorError
 

Code/autopkglib/__init__.py

@@ -69,7 +69,6 @@ def is_linux():
 
 
 try:
-    from Foundation import NSArray, NSDictionary, NSNumber
     from CoreFoundation import (
         CFPreferencesAppSynchronize,
         CFPreferencesCopyAppValue,
@@ -77,9 +76,10 @@ try:
         CFPreferencesSetAppValue,
         kCFPreferencesAnyHost,
         kCFPreferencesAnyUser,
-        kCFPreferencesCurrentUser,
         kCFPreferencesCurrentHost,
+        kCFPreferencesCurrentUser,
     )
+    from Foundation import NSArray, NSDictionary, NSNumber
 except ImportError:
     if is_mac():
         print(

Code/autopkgserver/packager.py

@@ -15,10 +15,8 @@
 # limitations under the License.
 
 
-import grp
 import os
 import plistlib
-import pwd
 import re
 import shutil
 import stat
@@ -26,6 +24,9 @@ import subprocess
 import tempfile
 from xml.parsers.expat import ExpatError
 
+import grp
+import pwd
+
 __all__ = ["Packager", "PackagerError"]
 
 

requirements.txt

@@ -5,28 +5,28 @@
 appdirs==1.4.3
 aspy.yaml==1.2.0
 attrs==19.1.0
-black==19.3b0
+black==19.10b0
 certifi==2019.9.11
 cffi==1.13.1
-cfgv==1.6.0
+cfgv==2.0.0
 Click==7.0
 entrypoints==0.3
 flake8-bugbear==19.3.0
-flake8==3.7.7
+flake8==3.8.3
 identify==1.4.3
 importlib-metadata==0.13
-isort==4.3.20
+isort==5.0.4
 mccabe==0.6.1
 nodeenv==1.3.3
-pre-commit~=2.5
-pycodestyle==2.5.0
+pre-commit==2.5
+pycodestyle==2.6.0
 pycparser==2.19
-pyflakes==2.1.1
+pyflakes==2.2.0
 PyYAML==5.3.1
 six==1.12.0
 tokenize-rt==3.2.0
 toml==0.10.0
-virtualenv==16.6.0
+virtualenv==20.0.8
 zipp==0.5.1
 #
 # *nix Requirements