PyCQA · Mar 21, 2021 · Mar 21, 2021 · Mar 22, 2021 · Mar 23, 2021 · Mar 23, 2021
diff --git a/.coveragerc b/.coveragerc
@@ -1,4 +1,5 @@
 [run]
+branch = True
 omit =
   isort/_future/*
   isort/_vendored/*

diff --git a/.cruft.json b/.cruft.json
@@ -1,16 +1,17 @@
 {
-    "template": "https://github.com/timothycrosley/cookiecutter-python/",
-    "commit": "9be01014cde7ec06bd52415655d52ca30a9e9bcc",
-    "context": {
-        "cookiecutter": {
-            "full_name": "Timothy Crosley",
-            "email": "timothy.crosley@gmail.com",
-            "github_username": "pycqa",
-            "project_name": "isort",
-            "description": "A Python utility / library to sort Python imports.",
-            "version": "4.3.21",
-            "_template": "https://github.com/timothycrosley/cookiecutter-python/"
-        }
-    },
-    "directory": ""
-}
+  "template": "https://github.com/timothycrosley/cookiecutter-python/",
+  "commit": "4f2a3601ad12239bf6cbeedba8ecf297690ab07f",
+  "context": {
+    "cookiecutter": {
+      "full_name": "Timothy Crosley",
+      "email": "timothy.crosley@gmail.com",
+      "github_username": "pycqa",
+      "project_name": "isort",
+      "description": "A Python utility / library to sort Python imports.",
+      "version": "4.3.21",
+      "_template": "https://github.com/timothycrosley/cookiecutter-python/"
+    }
+  },
+  "directory": "",
+  "checkout": null
+}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,4 +61,4 @@ jobs:
           poetry run coverage xml
       - name: Report Coverage
         if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8'
-        uses: codecov/codecov-action@v1.0.6
+        uses: codecov/codecov-action@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,25 @@ 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.9.0 June 21st 2021
+  - Improved CLI startup time.
+  - Implemented #1697: Provisional support for PEP 582: skip `__pypackages__` directories by default.
+  - Implemented #1705: More intuitive handling of isort:skip_file comments on streams.
+  - Implemented #1737: Support for using action comments to avoid adding imports to individual files.
+  - Implemented #1750: Ability to customize output format lines.
+  - Implemented #1732: Support for custom sort functions.
+  - Implemented #1722: Improved behavior for running isort in atomic mode over Cython source files.
+  - Fixed (https://github.com/PyCQA/isort/pull/1695): added imports being added to doc string in some cases.
+  - Fixed (https://github.com/PyCQA/isort/pull/1714): in rare cases line continuation combined with tabs can output invalid code.
+  - Fixed (https://github.com/PyCQA/isort/pull/1726): isort ignores reverse_sort when force_sort_within_sections is true.
+  - Fixed #1741: comments in hanging indent modes can lead to invalid code.
+  - Fixed #1744: repeat noqa comments dropped when * import and non * imports exist from the same package.
+  - Fixed #1721: repeat noqa comments on separate from lines with force-single-line set, sometimes get dropped.
+
+#### Goal Zero (Tickets related to aspirational goal of achieving 0 regressions for remaining 5.0.0 lifespan):
+  - Implemented #1394: 100% branch coverage (in addition to line coverage) enforced.
+  - Implemented #1751: Strict typing enforcement (turned on mypy strict mode).
+
 ### 5.8.0 March 20th 2021
   - Fixed #1631: as import comments can in some cases be duplicated.
   - Fixed #1667: extra newline added with float-to-top, after skip, in some cases.

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
-[![isort - isort your imports, so you don't have to.](https://raw.githubusercontent.com/pycqa/isort/develop/art/logo_large.png)](https://pycqa.github.io/isort/)
+[![isort - isort your imports, so you don't have to.](https://raw.githubusercontent.com/pycqa/isort/main/art/logo_large.png)](https://pycqa.github.io/isort/)
 
 ------------------------------------------------------------------------
 
 [![PyPI version](https://badge.fury.io/py/isort.svg)](https://badge.fury.io/py/isort)
 [![Test Status](https://github.com/pycqa/isort/workflows/Test/badge.svg?branch=develop)](https://github.com/pycqa/isort/actions?query=workflow%3ATest)
 [![Lint Status](https://github.com/pycqa/isort/workflows/Lint/badge.svg?branch=develop)](https://github.com/pycqa/isort/actions?query=workflow%3ALint)
-[![Code coverage Status](https://codecov.io/gh/pycqa/isort/branch/develop/graph/badge.svg)](https://codecov.io/gh/pycqa/isort)
+[![Code coverage Status](https://codecov.io/gh/pycqa/isort/branch/main/graph/badge.svg)](https://codecov.io/gh/pycqa/isort)
 [![License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://pypi.org/project/isort/)
 [![Join the chat at https://gitter.im/timothycrosley/isort](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/timothycrosley/isort?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Downloads](https://pepy.tech/badge/isort)](https://pepy.tech/project/isort)
@@ -26,11 +26,11 @@ editors](https://github.com/pycqa/isort/wiki/isort-Plugins) to
 quickly sort all your imports. It requires Python 3.6+ to run but
 supports formatting Python 2 code too.
 
-- [Try isort now from your browser!](https://pycqa.github.io/isort/docs/quick_start/0.-try/)
-- [Using black? See the isort and black compatiblity guide.](https://pycqa.github.io/isort/docs/configuration/black_compatibility/)
-- [isort has official support for pre-commit!](https://pycqa.github.io/isort/docs/configuration/pre-commit/)
+- [Try isort now from your browser!](https://pycqa.github.io/isort/docs/quick_start/0.-try.html)
+- [Using black? See the isort and black compatibility guide.](https://pycqa.github.io/isort/docs/configuration/black_compatibility.html)
+- [isort has official support for pre-commit!](https://pycqa.github.io/isort/docs/configuration/pre-commit.html)
 
-![Example Usage](https://raw.github.com/pycqa/isort/develop/example.gif)
+![Example Usage](https://raw.github.com/pycqa/isort/main/example.gif)
 
 Before isort:
 
@@ -168,7 +168,7 @@ notified.
 
 You will notice above the \"multi\_line\_output\" setting. This setting
 defines how from imports wrap when they extend past the line\_length
-limit and has [12 possible settings](https://pycqa.github.io/isort/docs/configuration/multi_line_output_modes/).
+limit and has [12 possible settings](https://pycqa.github.io/isort/docs/configuration/multi_line_output_modes.html).
 
 ## Indentation
 
@@ -221,7 +221,7 @@ the `-e` option into the command line utility.
 isort provides configuration options to change almost every aspect of how
 imports are organized, ordered, or grouped together in sections.
 
-[Click here](https://pycqa.github.io/isort/docs/configuration/custom_sections_and_ordering/) for an overview of all these options.
+[Click here](https://pycqa.github.io/isort/docs/configuration/custom_sections_and_ordering.html) for an overview of all these options.
 
 ## Skip processing of imports (outside of configuration)
 
@@ -258,7 +258,7 @@ import a
 
 isort can be ran or configured to add / remove imports automatically.
 
-[See a complete guide here.](https://pycqa.github.io/isort/docs/configuration/add_or_remove_imports/)
+[See a complete guide here.](https://pycqa.github.io/isort/docs/configuration/add_or_remove_imports.html)
 
 ## Using isort to verify code
 
@@ -289,14 +289,14 @@ project.
 isort provides a hook function that can be integrated into your Git
 pre-commit script to check Python code before committing.
 
-[More info here.](https://pycqa.github.io/isort/docs/configuration/git_hook/)
+[More info here.](https://pycqa.github.io/isort/docs/configuration/git_hook.html)
 
 ## Setuptools integration
 
 Upon installation, isort enables a `setuptools` command that checks
 Python files declared by your project.
 
-[More info here.](https://pycqa.github.io/isort/docs/configuration/setuptools_integration/)
+[More info here.](https://pycqa.github.io/isort/docs/configuration/setuptools_integration.html)
 
 ## Spread the word
 

diff --git a/docs/configuration/action_comments.md b/docs/configuration/action_comments.md
@@ -106,3 +106,12 @@ import a
 
 !!! tip
     isort split is exactly the same as placing an `# isort: on` immediately below an `# isort: off`
+
+
+## isort: dont-add-imports
+
+Tells isort to not automatically add imports to this file, even if --add-imports is set.
+
+## isort: dont-add-import: [IMPORT_LINE]
+
+Tells isort to not automatically add a particular import, even if --add-imports says to add it.
diff --git a/docs/configuration/black_compatibility.md b/docs/configuration/black_compatibility.md
@@ -1,15 +1,19 @@
-![isort loves black](https://raw.githubusercontent.com/pycqa/isort/develop/art/isort_loves_black.png)
+![isort loves black](https://raw.githubusercontent.com/pycqa/isort/main/art/isort_loves_black.png)
 
 Compatibility with black
 ========
 
 Compatibility with black is very important to the isort project and comes baked in starting with version 5.
 All that's required to use isort alongside black is to set the isort profile to "black".
 
+!!! tip
+    Beyond the profile, it is common to set [skip_gitignore](https://pycqa.github.io/isort/docs/configuration/options.html#skip-gitignore) (which is not enabled by default for isort as it requires git to be installed) and [line_length](https://pycqa.github.io/isort/docs/configuration/options.html#line-length) as it is common to deviate from black's default of 88.
+
+
 ## Using a config file (such as .isort.cfg)
 
 For projects that officially use both isort and black, we recommend setting the black profile in a config file at the root of your project's repository.
-This way independent to how users call isort (pre-commit, CLI, or editor integration) the black profile will automatically be applied.
+That way it's independent of how users call isort (pre-commit, CLI, or editor integration) the black profile will automatically be applied.
 
 For instance, your _pyproject.toml_ file would look something like
 
@@ -19,7 +23,7 @@ profile = "black"
 multi_line_output = 3
 ```
 
-Read More about supported [config files](https://pycqa.github.io/isort/docs/configuration/config_files/).
+Read More about supported [config files](https://pycqa.github.io/isort/docs/configuration/config_files.html).
 
 ## CLI
 
@@ -47,7 +51,7 @@ after_success:
 
 ```
 
-See [built-in profiles](https://pycqa.github.io/isort/docs/configuration/profiles/) for more profiles.
+See [built-in profiles](https://pycqa.github.io/isort/docs/configuration/profiles.html) for more profiles.
 
 ## Integration with pre-commit
 

diff --git a/docs/configuration/config_files.md b/docs/configuration/config_files.md
@@ -81,7 +81,7 @@ src_paths=isort,test
 
 ## Custom config files
 
-Optionally, you can also create a config file with a custom name, or directly point isort to a config file that falls lower in the priority order, by using [--settings-file](https://pycqa.github.io/isort/docs/configuration/options/#settings-path).
+Optionally, you can also create a config file with a custom name, or directly point isort to a config file that falls lower in the priority order, by using [--settings-file](https://pycqa.github.io/isort/docs/configuration/options.html#settings-path).
 This can be useful, for instance, if you want to have one configuration for `.py` files and another for `.pyx` - while keeping the config files at the root of your repository.
 
 !!! tip

diff --git a/docs/configuration/custom_sections_and_ordering.md b/docs/configuration/custom_sections_and_ordering.md
@@ -115,15 +115,15 @@ import b
 from a import a  # This will always appear below because it is a from import.
 ```
 
-However, if you prefer to keep strict alphabetical sorting you can set [force sort within sections](https://pycqa.github.io/isort/docs/configuration/options/#force-sort-within-sections) to true. Resulting in:
+However, if you prefer to keep strict alphabetical sorting you can set [force sort within sections](https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections) to true. Resulting in:
 
 
 ```python
 from a import a  # This will now appear at top because a appears in the alphabet before b
 import b
 ```
 
-You can even tell isort to always place from imports on top, instead of the default of placing them on bottom, using [from first](https://pycqa.github.io/isort/docs/configuration/options/#from-first).
+You can even tell isort to always place from imports on top, instead of the default of placing them on bottom, using [from first](https://pycqa.github.io/isort/docs/configuration/options.html#from-first).
 
 ```python
 from b import b # If from first is set to True, all from imports will be placed before non-from imports.

diff --git a/docs/configuration/multi_line_output_modes.md b/docs/configuration/multi_line_output_modes.md
@@ -1,6 +1,6 @@
 # Multi Line Output Modes
 
-This [config option](https://pycqa.github.io/isort/docs/configuration/options/#multi-line-output) defines how from imports wrap when they extend past the line\_length
+This [config option](https://pycqa.github.io/isort/docs/configuration/options.html#multi-line-output) defines how from imports wrap when they extend past the line\_length
 limit and has 12 possible settings:
 
 ## 0 - Grid