Merge pull request #2419 from lukbrew25/main

Update CHANGELOG.md + Fix Formatting and Grammar

Author: DanielNoord

CHANGELOG.md

@@ -4,6 +4,28 @@ 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).
 
+### 6.1.0 October 1 2025 
+
+   - Add python 3.14 classifier and badge (#2409) @staticdev
+   - Drop use of non-standard pkg_resources API (#2405) @dvarrazzo
+
+### 6.0.1 Febuary 26 2025
+
+   - Add OSError handling in find_imports_in_file (#2331) @kobarity
+
+### 6.0.0 January 27 2025
+
+   - Remove support for Python 3.8 (#2327) @DanielNoord 
+   - Python 3.13 support (#2306) @mayty
+   - Speed up exists_case_sensitive calls (#2264) @correctmost
+   - Ensure that split_on_trailing_comma works with as imports (#2340) @DanielNoord
+   - Black profile: enable magic comma (#2236) @MrMino
+   - Update line_length and single_line_exclusions in google profile (#2149) @jagapiou
+   - Allow --diff to be used with --jobs (#2302) @mnakama
+   - Fix wemake profile to have correct character limit (#2241) @sobolevn
+   - Fix sort_reexports code mangling (#2283) @Helveg
+   - Fix correct group by package tokenization (#2136) @glasnt
+
 ### 5.13.2 December 13 2023
 
    - Apply the bracket fix from issue #471 only for use_parentheses=True (#2184) @bp72

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

@@ -22,13 +22,13 @@ Base System Requirements:
 Once you have verified that your system matches the base requirements you can start to get the project working by following these steps:
 
 1. [Fork the project on GitHub](https://github.com/pycqa/isort/fork).
-1. Clone your fork to your local file system:
+2. Clone your fork to your local file system:
     `git clone https://github.com/$GITHUB_ACCOUNT/isort.git`
-1. `cd isort`
-1. `uv sync --all-extras --frozen`
+3. `cd isort`
+4. `uv sync --all-extras --frozen`
    * Optionally, isolate uv's installation from the rest of your system using the instructions on the uv site here: https://docs.astral.sh/uv/ 
-1. `./scripts/test.sh` should yield Success: no issues found
-1. `./scripts/clean.sh` should yield a report checking packages
+5. `./scripts/test.sh` should yield Success: no issues found
+6. `./scripts/clean.sh` should yield a report checking packages
 
 **TIP**: `./scripts/done.sh` will run both clean and test in one step.
 

docs/contributing/2.-coding-standard.md

@@ -1,14 +1,14 @@
 # HOPE 8 -- Style Guide for Hug Code
 
-|             |                                             |
-| ------------| ------------------------------------------- |
-| HOPE:       | 8                                           |
-| Title:      | Style Guide for Hug Code                    |
-| Author(s):  | Timothy Crosley <[email protected]> |
-| Status:     | Active                                      |
-| Type:       | Process                                     |
-| Created:    | 19-May-2019                                 |
-| Updated:    | 17-August-2019                                 |
+|            |                                             |
+|------------|---------------------------------------------|
+| HOPE:      | 8                                           |
+| Title:     | Style Guide for Hug Code                    |
+| Author(s): | Timothy Crosley <[email protected]> |
+| Status:    | Active                                      |
+| Type:      | Process                                     |
+| Created:   | 19-May-2019                                 |
+| Updated:   | 17-August-2019                              |
 
 ## Introduction
 

docs/contributing/3.-code-of-conduct.md

@@ -1,14 +1,14 @@
 # HOPE 11 -- Code of Conduct
 
-|             |                                             |
-| ------------| ------------------------------------------- |
-| HOPE:       | 11                                          |
-| Title:      | Code of Conduct                             |
-| Author(s):  | Timothy Crosley <[email protected]> |
-| Status:     | Active                                      |
-| Type:       | Process                                     |
-| Created:    | 17-August-2019                              |
-| Updated:    | 17-August-2019                              |
+|            |                                             |
+|------------|---------------------------------------------|
+| HOPE:      | 11                                          |
+| Title:     | Code of Conduct                             |
+| Author(s): | Timothy Crosley <[email protected]> |
+| Status:    | Active                                      |
+| Type:      | Process                                     |
+| Created:   | 17-August-2019                              |
+| Updated:   | 17-August-2019                              |
 
 ## Abstract
 
@@ -81,7 +81,7 @@ members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][https://www.contributor-covenant.org], version 1.4,
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4,
 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 For answers to common questions about this code of conduct, see

docs/quick_start/0.-try.md

@@ -14,6 +14,7 @@ Use our live isort editor to see how isort can help improve the formatting of yo
 <script src="https://cdn.jsdelivr.net/pyodide/v0.15.0/full/pyodide.js" integrity="sha256-W+0Mr+EvJb1qJx9UZ9wuvd/uWrXCzeaEu6OzEEHMCik=" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/[email protected]/src-min-noconflict/ace.min.js"></script>
 <link rel="stylesheet" type="text/css" href="https://pycqa.github.io/isort/docs/quick_start/interactive.css">
+<title>Try isort</title>
 </head>
 
 

isort/api.py

@@ -380,7 +380,7 @@ def sort_file(
     output: Optional[TextIO] = None,
     **config_kwargs: Any,
 ) -> bool:
-    """Sorts and formats any groups of imports imports within the provided file or Path.
+    """Sorts and formats any groups of imports within the provided file or Path.
      Returns `True` if the file has been changed, otherwise `False`.
 
     - **filename**: The name or Path of the file to format.