.github/workflows/integration.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: ["3.8"]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/lint.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: ["3.8"]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
         os: [ubuntu-latest, ubuntu-18.04, macos-latest, windows-latest]
 
     steps:
@@ -48,11 +48,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install dependencies
+      - name: Install poetry
         run: |
           python -m pip install --upgrade pip
           python -m pip install --upgrade poetry
-          poetry install
+
+      - name: Install dependencies
+        run: poetry install
 
       - name: Test
         shell: bash

CHANGELOG.md

@@ -4,6 +4,16 @@ Changelog
 NOTE: isort follows the [semver](https://semver.org/) versioning standard.
 Find out more about isort's release policy [here](https://pycqa.github.io/isort/docs/major_releases/release_policy).
 
+### 5.10.0 November 3 2021
+  - Implemented #1796: Switch to `tomli` for pyproject.toml configuration loader.
+  - Fixed #1801: CLI bug (--exend-skip-glob, overrides instead of extending).
+  - Fixed #1802: respect PATH customization in nested calls to git.
+  - Fixed #1838: Append only with certain code snippets incorrectly adds imports.
+  - Added official support for Python 3.10
+
+#### Potentially breaking changes:
+  - Fixed #1785: `_ast` module incorrectly excluded from stdlib definition.
+
 ### 5.9.3 July 28 2021
   - Improved text of skipped file message to mention gitignore feature.
   - Made all exceptions pickleable.

Dockerfile

@@ -4,7 +4,7 @@ FROM python:$VERSION
 # Install pip and poetry
 RUN python -m pip install --upgrade pip && python -m pip install poetry
 
-# Setup as minimal a stub project as posible, simply to allow caching base dependencies
+# Setup as minimal a stub project as possible, simply to allow caching base dependencies
 # between builds.
 #
 # If error is encountered in these steps, can safely be removed locally.

docs/configuration/options.md

@@ -9,7 +9,7 @@ profiles](https://pycqa.github.io/isort/docs/configuration/profiles.html).
 
 ## Python Version
 
-Tells isort to set the known standard library based on the specified Python version. Default is to assume any Python 3 version could be the target, and use a union of all stdlib modules across versions. If auto is specified, the version of the interpreter used to run isort (currently: 38) will be used.
+Tells isort to set the known standard library based on the specified Python version. Default is to assume any Python 3 version could be the target, and use a union of all stdlib modules across versions. If auto is specified, the version of the interpreter used to run isort (currently: 39) will be used.
 
 **Type:** String  
 **Default:** `py3`  
@@ -56,28 +56,31 @@ Extends --skip to add additional files that isort should skip over. If you want
 
 ## Skip Glob
 
-Additional files that isort should skip over (extending --skip-glob).
+Files that isort should skip over.
 
 **Type:** Frozenset  
 **Default:** `frozenset()`  
 **Python & Config File Name:** skip_glob  
 **CLI Flags:**
 
-- --extend-skip-glob
+- --sg
+- --skip-glob
 
 ## Extend Skip Glob
 
-**No Description**
+Additional files that isort should skip over (extending --skip-glob).
 
 **Type:** Frozenset  
 **Default:** `frozenset()`  
 **Python & Config File Name:** extend_skip_glob  
-**CLI Flags:** **Not Supported**
+**CLI Flags:**
+
+- --extend-skip-glob
 
 ## Skip Gitignore
 
 Treat project as a git repository and ignore files listed in .gitignore.
-NOTE: This requires git to be installed and accesible from the same shell as isort.
+NOTE: This requires git to be installed and accessible from the same shell as isort.
 
 **Type:** Bool  
 **Default:** `False`  
@@ -199,7 +202,7 @@ Force isort to recognize a module as being a local folder. Generally, this is re
 Force isort to recognize a module as part of Python's standard library.
 
 **Type:** Frozenset  
-**Default:** `('_dummy_thread', '_thread', 'abc', 'aifc', 'argparse', 'array', 'ast', 'asynchat', 'asyncio', 'asyncore', 'atexit', 'audioop', 'base64', 'bdb', 'binascii', 'binhex', 'bisect', 'builtins', 'bz2', 'cProfile', 'calendar', 'cgi', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop', 'collections', 'colorsys', 'compileall', 'concurrent', 'configparser', 'contextlib', 'contextvars', 'copy', 'copyreg', 'crypt', 'csv', 'ctypes', 'curses', 'dataclasses', 'datetime', 'dbm', 'decimal', 'difflib', 'dis', 'distutils', 'doctest', 'dummy_threading', 'email', 'encodings', 'ensurepip', 'enum', 'errno', 'faulthandler', 'fcntl', 'filecmp', 'fileinput', 'fnmatch', 'formatter', 'fpectl', 'fractions', 'ftplib', 'functools', 'gc', 'getopt', 'getpass', 'gettext', 'glob', 'graphlib', 'grp', 'gzip', 'hashlib', 'heapq', 'hmac', 'html', 'http', 'imaplib', 'imghdr', 'imp', 'importlib', 'inspect', 'io', 'ipaddress', 'itertools', 'json', 'keyword', 'lib2to3', 'linecache', 'locale', 'logging', 'lzma', 'macpath', 'mailbox', 'mailcap', 'marshal', 'math', 'mimetypes', 'mmap', 'modulefinder', 'msilib', 'msvcrt', 'multiprocessing', 'netrc', 'nis', 'nntplib', 'ntpath', 'numbers', 'operator', 'optparse', 'os', 'ossaudiodev', 'parser', 'pathlib', 'pdb', 'pickle', 'pickletools', 'pipes', 'pkgutil', 'platform', 'plistlib', 'poplib', 'posix', 'posixpath', 'pprint', 'profile', 'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'queue', 'quopri', 'random', 're', 'readline', 'reprlib', 'resource', 'rlcompleter', 'runpy', 'sched', 'secrets', 'select', 'selectors', 'shelve', 'shlex', 'shutil', 'signal', 'site', 'smtpd', 'smtplib', 'sndhdr', 'socket', 'socketserver', 'spwd', 'sqlite3', 'sre', 'sre_compile', 'sre_constants', 'sre_parse', 'ssl', 'stat', 'statistics', 'string', 'stringprep', 'struct', 'subprocess', 'sunau', 'symbol', 'symtable', 'sys', 'sysconfig', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios', 'test', 'textwrap', 'threading', 'time', 'timeit', 'tkinter', 'token', 'tokenize', 'trace', 'traceback', 'tracemalloc', 'tty', 'turtle', 'turtledemo', 'types', 'typing', 'unicodedata', 'unittest', 'urllib', 'uu', 'uuid', 'venv', 'warnings', 'wave', 'weakref', 'webbrowser', 'winreg', 'winsound', 'wsgiref', 'xdrlib', 'xml', 'xmlrpc', 'zipapp', 'zipfile', 'zipimport', 'zlib', 'zoneinfo')`  
+**Default:** `('_ast', '_dummy_thread', '_thread', 'abc', 'aifc', 'argparse', 'array', 'ast', 'asynchat', 'asyncio', 'asyncore', 'atexit', 'audioop', 'base64', 'bdb', 'binascii', 'binhex', 'bisect', 'builtins', 'bz2', 'cProfile', 'calendar', 'cgi', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop', 'collections', 'colorsys', 'compileall', 'concurrent', 'configparser', 'contextlib', 'contextvars', 'copy', 'copyreg', 'crypt', 'csv', 'ctypes', 'curses', 'dataclasses', 'datetime', 'dbm', 'decimal', 'difflib', 'dis', 'distutils', 'doctest', 'dummy_threading', 'email', 'encodings', 'ensurepip', 'enum', 'errno', 'faulthandler', 'fcntl', 'filecmp', 'fileinput', 'fnmatch', 'formatter', 'fpectl', 'fractions', 'ftplib', 'functools', 'gc', 'getopt', 'getpass', 'gettext', 'glob', 'graphlib', 'grp', 'gzip', 'hashlib', 'heapq', 'hmac', 'html', 'http', 'imaplib', 'imghdr', 'imp', 'importlib', 'inspect', 'io', 'ipaddress', 'itertools', 'json', 'keyword', 'lib2to3', 'linecache', 'locale', 'logging', 'lzma', 'macpath', 'mailbox', 'mailcap', 'marshal', 'math', 'mimetypes', 'mmap', 'modulefinder', 'msilib', 'msvcrt', 'multiprocessing', 'netrc', 'nis', 'nntplib', 'ntpath', 'numbers', 'operator', 'optparse', 'os', 'ossaudiodev', 'parser', 'pathlib', 'pdb', 'pickle', 'pickletools', 'pipes', 'pkgutil', 'platform', 'plistlib', 'poplib', 'posix', 'posixpath', 'pprint', 'profile', 'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'queue', 'quopri', 'random', 're', 'readline', 'reprlib', 'resource', 'rlcompleter', 'runpy', 'sched', 'secrets', 'select', 'selectors', 'shelve', 'shlex', 'shutil', 'signal', 'site', 'smtpd', 'smtplib', 'sndhdr', 'socket', 'socketserver', 'spwd', 'sqlite3', 'sre', 'sre_compile', 'sre_constants', 'sre_parse', 'ssl', 'stat', 'statistics', 'string', 'stringprep', 'struct', 'subprocess', 'sunau', 'symbol', 'symtable', 'sys', 'sysconfig', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios', 'test', 'textwrap', 'threading', 'time', 'timeit', 'tkinter', 'token', 'tokenize', 'trace', 'traceback', 'tracemalloc', 'tty', 'turtle', 'turtledemo', 'types', 'typing', 'unicodedata', 'unittest', 'urllib', 'uu', 'uuid', 'venv', 'warnings', 'wave', 'weakref', 'webbrowser', 'winreg', 'winsound', 'wsgiref', 'xdrlib', 'xml', 'xmlrpc', 'zipapp', 'zipfile', 'zipimport', 'zlib', 'zoneinfo')`  
 **Python & Config File Name:** known_standard_library  
 **CLI Flags:**
 
@@ -428,6 +431,15 @@ Sets the default section for import options: ('FUTURE', 'STDLIB', 'THIRDPARTY',
 **Python & Config File Name:** import_headings  
 **CLI Flags:** **Not Supported**
 
+## Import Footers
+
+**No Description**
+
+**Type:** Dict  
+**Default:** `{}`  
+**Python & Config File Name:** import_footers  
+**CLI Flags:** **Not Supported**
+
 ## Balanced Wrapping
 
 Balances wrapping to produce the most consistent line length possible
@@ -479,6 +491,18 @@ Ensures the output doesn't save if the resulting file contains syntax errors.
 - --ac
 - --atomic
 
+## Lines Before Imports
+
+How many lines to add before an import section
+
+**Type:** Int
+**Default:** `-1`
+**Python & Config File Name:** lines_before_imports
+**CLI Flags:**
+
+- --lbi
+- --lines-before-imports
+
 ## Lines After Imports
 
 **No Description**
@@ -796,7 +820,6 @@ Tells isort to honor noqa comments to enforce skipping those comments.
 
 Add an explicitly defined source path (modules within src paths have their imports automatically categorized as first_party). Glob expansion (`*` and `**`) is supported for this option.
 
-
 **Type:** Tuple  
 **Default:** `()`  
 **Python & Config File Name:** src_paths  
@@ -1244,7 +1267,7 @@ Explicitly set the settings path or file instead of auto determining based on fi
 
 ## Jobs
 
-Number of files to process in parallel.
+Number of files to process in parallel. Negative value means use number of CPUs.
 
 **Type:** Int  
 **Default:** `None`  

docs/configuration/pre-commit.md

@@ -7,9 +7,20 @@ isort provides official support for [pre-commit](https://pre-commit.com/).
 
 To use isort's official pre-commit integration add the following config:
 
+```yaml
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.0
+    hooks:
+      - id: isort
+        name: isort (python)
 ```
+
+under the `repos` section of your projects `.pre-commit-config.yaml` file.  Optionally if you want to have different hooks
+over different file types (ex: python vs cython vs pyi) you can do so with the following config:
+
+```yaml
   - repo: https://github.com/pycqa/isort
-    rev: 5.8.0
+    rev: 5.10.0
     hooks:
       - id: isort
         name: isort (python)
@@ -21,12 +32,10 @@ To use isort's official pre-commit integration add the following config:
         types: [pyi]
 ```
 
-under the `repos` section of your projects `.pre-commit-config.yaml` file.
-
 ### seed-isort-config
 
 Older versions of isort used a lot of magic to determine import placement, that could easily break when running on CI/CD.
-To fix this, a utilitiy called `seed-isort-config` was created. Since isort 5 however, the project has drastically improved its placement
+To fix this, a utility called `seed-isort-config` was created. Since isort 5 however, the project has drastically improved its placement
 logic and ensured a good level of consistency across environments.
 If you have a step in your pre-commit config called `seed-isort-config` or similar, it is highly recommend that you remove this.
 It is guaranteed to slow things down, and can conflict with isort's own module placement logic.

docs/contributing/1.-contributing-guide.md

@@ -49,7 +49,7 @@ A local test cycle might look like the following:
 3. if #2 fails, debug, save, and goto #1
     * `docker run -it isort bash` will get you into the failed environment
     * `docker run -v $(git rev-parse --show-toplevel):/isort` will make changes made in the docker environment persist on your local checkout.
-      **TIP**: combine both to get an interacive docker shell that loads changes made locally, even after build, to quickly rerun that pesky failing test
+      **TIP**: combine both to get an interactive docker shell that loads changes made locally, even after build, to quickly rerun that pesky failing test
 4. `./scripts/docker.sh`
 5. if #4 fails, debug, save and goto #1; you may need to specify a different `--build-arg VERSION=$VER`
 6. congrats! you are probably ready to push a contribution

docs/contributing/4.-acknowledgements.md

@@ -230,6 +230,7 @@ Code Contributors
 - Bob (@bobwalker99)
 - Martijn Pieters (@mjpieters)
 - Asiel Díaz Benítez (@adbenitez)
+- Almaz (@monosans)
 
 Documenters
 ===================

isort/_future/_dataclasses.py

@@ -284,7 +284,7 @@ def __repr__(self):
 
     # This is used to support the PEP 487 __set_name__ protocol in the
     # case where we're using a field that contains a descriptor as a
-    # defaul value.  For details on __set_name__, see
+    # default value.  For details on __set_name__, see
     # https://www.python.org/dev/peps/pep-0487/#implementation-details.
     #
     # Note that in _process_class, this Field object is overwritten
@@ -680,7 +680,7 @@ def _get_field(cls, a_name, a_type):
     # In addition to checking for actual types here, also check for
     # string annotations.  get_type_hints() won't always work for us
     # (see https://github.com/python/typing/issues/508 for example),
-    # plus it's expensive and would require an eval for every stirng
+    # plus it's expensive and would require an eval for every string
     # annotation.  So, make a best effort to see if this is a ClassVar
     # or InitVar using regex's and checking that the thing referenced
     # is actually of the correct type.
@@ -1148,7 +1148,7 @@ class C(Base):
             raise TypeError(f"Invalid field: {item!r}")
 
         if not isinstance(name, str) or not name.isidentifier():
-            raise TypeError(f"Field names must be valid identifers: {name!r}")
+            raise TypeError(f"Field names must be valid identifiers: {name!r}")
         if keyword.iskeyword(name):
             raise TypeError(f"Field names must not be keywords: {name!r}")
         if name in seen: