.github/labels.yml

@@ -0,0 +1,66 @@
+---
+# Labels names are important as they are used by Release Drafter to decide
+# regarding where to record them in changelog or if to skip them.
+#
+# The repository labels will be automatically configured using this file and
+# the GitHub Action https://github.com/marketplace/actions/github-labeler.
+- name: breaking
+  description: Breaking Changes
+  color: "bfd4f2"
+- name: bug
+  description: Something isn't working
+  color: "d73a4a"
+- name: build
+  description: Build System and Dependencies
+  color: "bfdadc"
+- name: ci
+  description: Continuous Integration
+  color: "4a97d6"
+- name: dependencies
+  description: Pull requests that update a dependency file
+  color: "0366d6"
+- name: documentation
+  description: Improvements or additions to documentation
+  color: "0075ca"
+- name: duplicate
+  description: This issue or pull request already exists
+  color: "cfd3d7"
+- name: enhancement
+  description: New feature or request
+  color: "a2eeef"
+- name: github_actions
+  description: Pull requests that update Github_actions code
+  color: "000000"
+- name: good first issue
+  description: Good for newcomers
+  color: "7057ff"
+- name: help wanted
+  description: Extra attention is needed
+  color: "008672"
+- name: invalid
+  description: This doesn't seem right
+  color: "e4e669"
+- name: performance
+  description: Performance
+  color: "016175"
+- name: python
+  description: Pull requests that update Python code
+  color: "2b67c6"
+- name: question
+  description: Further information is requested
+  color: "d876e3"
+- name: refactoring
+  description: Refactoring
+  color: "ef67c4"
+- name: removal
+  description: Removals and Deprecations
+  color: "9ae7ea"
+- name: style
+  description: Style
+  color: "c120e5"
+- name: testing
+  description: Testing
+  color: "b1fc6f"
+- name: wontfix
+  description: This will not be worked on
+  color: "ffffff"

.github/release-drafter.yml

@@ -0,0 +1,31 @@
+categories:
+  - title: ":boom: Breaking Changes"
+    label: "breaking"
+  - title: ":rocket: Features"
+    label: "enhancement"
+  - title: ":fire: Removals and Deprecations"
+    label: "removal"
+  - title: ":beetle: Fixes"
+    label: "bug"
+  - title: ":raising_hand: Help wanted"
+    label: "help wanted"
+  - title: ":racehorse: Performance"
+    label: "performance"
+  - title: ":rotating_light: Testing"
+    label: "testing"
+  - title: ":construction_worker: Continuous Integration"
+    label: "ci"
+  - title: ":books: Documentation"
+    label: "documentation"
+  - title: ":hammer: Refactoring"
+    label: "refactoring"
+  - title: ":lipstick: Style"
+    label: "style"
+  - title: ":package: Dependencies"
+    labels:
+      - "dependencies"
+      - "build"
+template: |
+  ## Changes
+
+  $CHANGES

.github/workflows/constraints.txt

@@ -0,0 +1,3 @@
+pip==22.3.1
+poetry==1.3.1
+virtualenv==20.17.1

.github/workflows/integration.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.9"]
 
     steps:
       - uses: actions/checkout@v2
@@ -25,11 +25,18 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install dependencies
+      - name: Upgrade pip
+        run: |
+          pip install --constraint=.github/workflows/constraints.txt pip
+          pip --version
+
+      - name: Install Poetry
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade poetry
-          poetry install
+          pipx install --pip-args=--constraint=.github/workflows/constraints.txt poetry
+          poetry --version
+
+      - name: Install dependencies
+        run: poetry install
 
       - name: Test integration
         run: ./scripts/test_integration.sh

.github/workflows/labeler.yml

@@ -0,0 +1,18 @@
+name: Labeler
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  labeler:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v3
+
+      - name: Run Labeler
+        uses: crazy-max/ghaction-github-labeler@v4
+        with:
+          skip-delete: true

.github/workflows/lint.yml

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

.github/workflows/release-drafter.yml

@@ -0,0 +1,15 @@
+---
+name: Release Drafter
+
+"on":
+  push:
+    branches:
+      - main
+
+jobs:
+  draft_release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
-        os: [ubuntu-latest, ubuntu-18.04, macos-latest, windows-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -48,19 +48,26 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install poetry
+      - name: Upgrade pip
+        run: |
+          pip install --constraint=.github/workflows/constraints.txt pip
+          pip --version
+
+      - name: Install Poetry
         run: |
           python -m pip install --upgrade pip
+          pipx install --pip-args=--constraint=.github/workflows/constraints.txt poetry
           python -m pip install --upgrade poetry
+          poetry --version
+          poetry install
 
       - name: Install dependencies
         run: poetry install
 
       - name: Test
         shell: bash
-        run: |
-          poetry run pytest tests/unit/ -s --cov=isort/ --cov-report=term-missing ${@-}
-          poetry run coverage xml
+        run: ./scripts/test.sh
+
       - name: Report Coverage
         if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8'
         uses: codecov/codecov-action@v1

.gitignore

@@ -27,6 +27,7 @@ npm-debug.log
 # Unit test / coverage reports
 .coverage
 .coverage.*
+coverage.xml
 .pytest_cache
 .tox
 nosetests.xml
@@ -68,6 +69,7 @@ atlassian-ide-plugin.xml
 pip-selfcheck.json
 
 # Python3 Venv Files
+.python-version
 .venv/
 pyvenv.cfg
 

.pre-commit-hooks.yaml

@@ -3,7 +3,6 @@
     entry: isort
     require_serial: true
     language: python
-    language_version: python3
     types_or: [cython, pyi, python]
     args: ['--filter-files']
     minimum_pre_commit_version: '2.9.2'

CHANGELOG.md

@@ -4,6 +4,32 @@ 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.11.0 December 12 2022
+
+  - Added official support for Python 3.11 (#1996, #2008, #2011) @staticdev
+  - Dropped support for Python 3.6 (#2019) @barrelful
+  - Fixed problematic tests (#2021, #2022) @staticdev
+  - Fixed #1960: Rich compatibility (#1961) @ofek
+  - Fixed #1945, #1986: Python 4.0 upper bound dependency resolving issues @staticdev
+  - Fixed Pyodide CDN URL (#1991) @andersk
+  - Docs: clarify description of use_parentheses (#1941) @mgedmin
+  - Fixed #1976: `black` compatibility for `.pyi` files @XuehaiPan
+  - Implemented #1683: magic trailing comma option (#1876) @legau
+  - Add missing space in unrecoverable exception message (#1933) @andersk
+  - Fixed #1895: skip-gitignore: use allow list, not deny list @bmalehorn
+  - Fixed #1917: infinite loop for unmatched parenthesis (#1919) @anirudnits
+  - Docs: shared profiles (#1896) @matthewhughes934
+  - Fixed build-backend values in the example plugins (#1892) @mgorny
+  - Remove reference to jamescurtin/isort-action (#1885) @AndrewLane
+  - Split long cython import lines (#1931) @davidcollins001
+  - Update plone profile: copy of `black`, plus three settings. (#1926) @mauritsvanrees
+  - Fixed #1815, #1862: Add a command-line flag to sort all re-exports (#1863) @parafoxia
+  - Fixed #1854: `lines_before_imports` appending lines after comments (#1861) @legau
+  - Remove redundant `multi_line_output = 3` from "Compatibility with black" (#1858) @jdufresne
+  - Add tox config example (#1856) @umonaca
+  - Docs: add examples for frozenset and tuple settings (#1822) @sgaist
+  - Docs: add multiple config documentation (#1850) @anirudnits
+
 ### 5.10.1 November 8 2021
   - Fixed #1819: Occasional inconsistency with multiple src paths.
   - Fixed #1840: skip_file ignored when on the first docstring line

README.md

@@ -23,7 +23,7 @@ isort is a Python utility / library to sort imports alphabetically, and
 automatically separated into sections and by type. It provides a command line
 utility, Python library and [plugins for various
 editors](https://github.com/pycqa/isort/wiki/isort-Plugins) to
-quickly sort all your imports. It requires Python 3.6+ to run but
+quickly sort all your imports. It requires Python 3.7+ 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.html)

docs/configuration/black_compatibility.md

@@ -20,7 +20,6 @@ For instance, your _pyproject.toml_ file would look something like
 ```ini
 [tool.isort]
 profile = "black"
-multi_line_output = 3
 ```
 
 Read More about supported [config files](https://pycqa.github.io/isort/docs/configuration/config_files.html).
@@ -34,9 +33,9 @@ A demo of how this would look like in your _.travis.yml_
 ```yaml
 language: python
 python:
-  - "3.6"
-  - "3.7"
+  - "3.9"
   - "3.8"
+  - "3.7"
 
 install:
   - pip install -r requirements-dev.txt
@@ -64,4 +63,3 @@ You can also set the profile directly when integrating isort within pre-commit.
       - id: isort
         args: ["--profile", "black", "--filter-files"]
 ```
-

docs/configuration/config_files.md

@@ -61,6 +61,8 @@ Because isort verification is commonly ran as a testing step, some prefer to pla
 
 ```ini
 [isort]
+profile = black
+multi_line_output = 3
 ```
 
 ## .editorconfig
@@ -87,3 +89,30 @@ This can be useful, for instance, if you want to have one configuration for `.py
 !!! tip
     Custom config files should place their configuration options inside an `[isort]` section and never a generic `[settings]` section. This is because isort can't know for sure
     how other tools are utilizing the config file.
+
+
+## Supporting multiple config files in single isort run
+
+If you have a directory structure where different sub-directories may have their separate configuration settings and you want isort to respect these configurations, not just apply the same global configuration for the entire directory then you can do so with the `--resolve-all-configs` flag. Using the `--resolve-all-configs` along with providing the directory root as `--config-root` argument(if the config-root is not explicitly defined, then isort will consider the current directory `.` where the shell is running), isort will traverse and parse all the config files defined under the `--config-root` and dynamically decide what configurations should be applied to a specific file by choosing the nearest config file in the file's path. For instance, if your directory structure is
+
+```
+directory_root
+
+    subdir1
+        .isort.cfg
+        file1.py
+
+    subdir2
+        pyproject.toml
+        file2.py
+
+    subdir3
+        file3.py
+
+    setup.cfg
+```
+
+isort will sort `subdir1/file1` according to the configurations defined in `subdir1/.isort.cfg`, `subdir2/file2` with configurations from `subdir2/pyproject.toml` and `subdir3/file3.py` based on the `setup.cfg` settings.
+
+!!! tip
+You can always confirm exactly what config file was used for a file by running isort with the `--verbose` flag.

docs/configuration/github_action.md

@@ -52,7 +52,7 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.8
-      - uses: jamescurtin/isort-action@master
+      - uses: isort/isort-action@master
         with:
             requirementsFiles: "requirements.txt requirements-test.txt"
 ```