Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PyCQA/isort
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.11.3
Choose a base ref
...
head repository: PyCQA/isort
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5.11.4
Choose a head ref
  • 11 commits
  • 12 files changed
  • 5 contributors

Commits on Dec 17, 2022

  1. Copy the full SHA
    f501d7c View commit details
  2. Merge pull request #2052 from hugovk/main

    Only run release workflows for upstream
    timothycrosley authored Dec 17, 2022
    Copy the full SHA
    227c4ae View commit details
  3. Copy the full SHA
    ff306f8 View commit details

Commits on Dec 21, 2022

  1. Stop installing documentation files to top-level site-packages

    Add `format = sdist` to `include` table values to prevent
    the documentation files from being installed directly into
    site-packages, i.e.:
    
        /usr/lib/python3.11/site-packages/CHANGELOG.md
        /usr/lib/python3.11/site-packages/LICENSE
    
    Originally reported by Anna Vyalkova on https://bugs.gentoo.org/887569.
    mgorny committed Dec 21, 2022
    Copy the full SHA
    a6fdbfd View commit details
  2. Merge pull request #2057 from mgorny/poetry-install

    Stop installing documentation files to top-level site-packages
    staticdev authored Dec 21, 2022
    Copy the full SHA
    3020e0b View commit details
  3. Remove obsolete toml import from the test suite

    Remove the `toml` import that is used to determine whether to run
    `pyproject.toml` test.  Firstly, `toml` has been replaced by `tomli`.
    Secondly, isort vendors `tomli`, so checking for its availability
    does not seem to make sense.
    mgorny committed Dec 21, 2022
    Copy the full SHA
    45d6abd View commit details
  4. Merge pull request #1978 from mgorny/toml-test

    Remove obsolete `toml` import from the test suite
    staticdev authored Dec 21, 2022
    Copy the full SHA
    3c2e2d0 View commit details
  5. Bump Poetry 1.3.1

    staticdev committed Dec 21, 2022
    Copy the full SHA
    36caa91 View commit details
  6. Merge pull request #2058 from PyCQA/deps/poetry-1.3.1

    Bump Poetry 1.3.1
    staticdev authored Dec 21, 2022
    Copy the full SHA
    f9add58 View commit details
  7. Bump version 5.11.4

    staticdev committed Dec 21, 2022
    Copy the full SHA
    df69a05 View commit details
  8. Merge pull request #2059 from PyCQA/version/5.11.4

    Bump version 5.11.4
    staticdev authored Dec 21, 2022
    Copy the full SHA
    98390f5 View commit details
1 change: 0 additions & 1 deletion .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
pip==22.3.1
poetry==1.2.2
virtualenv==20.17.1
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ jobs:
- name: Install Poetry
run: |
pipx install --pip-args=--constraint=.github/workflows/constraints.txt poetry
pipx install --pip-args=--constraint=.github/workflows/poetry-constraints.txt poetry
poetry --version
- name: Install dependencies
15 changes: 11 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -31,11 +31,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
pip install --constraint=.github/workflows/poetry-constraints.txt poetry
poetry --version
- name: Install dependencies
run: poetry install

- name: Lint
run: ./scripts/lint.sh
1 change: 1 addition & 0 deletions .github/workflows/poetry-constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
poetry==1.3.1
1 change: 1 addition & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ name: Release Drafter

jobs:
draft_release:
if: github.repository_owner == 'PyCQA'
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v5
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ name: Release

jobs:
release:
if: github.repository_owner == 'PyCQA'
name: Release
runs-on: ubuntu-latest
steps:
@@ -28,7 +29,7 @@ jobs:
- name: Install Poetry
run: |
pip install --constraint=.github/workflows/constraints.txt poetry
pip install --constraint=.github/workflows/poetry-constraints.txt poetry
poetry --version
- name: Check if there is a parent commit
@@ -41,6 +42,7 @@ jobs:
if: steps.check-parent-commit.outputs.sha
uses: salsify/action-detect-and-tag-new-version@v2
with:
tag-template: "{VERSION}"
version-command: |
bash -o pipefail -c "poetry version | awk '{ print \$2 }'"
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ jobs:
- name: Install Poetry
run: |
pipx install --pip-args=--constraint=.github/workflows/constraints.txt poetry
pipx install --pip-args=--constraint=.github/workflows/poetry-constraints.txt poetry
poetry --version
- name: Install dependencies
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,13 @@ 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.4 December 21 2022

- Fixed #2038 (again): stop installing documentation files to top-level site-packages (#2057) @mgorny
- CI: only run release workflows for upstream (#2052) @hugovk
- Tests: remove obsolete toml import from the test suite (#1978) @mgorny
- CI: bump Poetry 1.3.1 (#2058) @staticdev

### 5.11.3 December 16 2022

- Fixed #2007: settings for py3.11 (#2040) @staticdev
4 changes: 2 additions & 2 deletions docs/configuration/pre-commit.md
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ To use isort's official pre-commit integration add the following config:

```yaml
- repo: https://github.com/pycqa/isort
rev: 5.11.3
rev: 5.11.4
hooks:
- id: isort
name: isort (python)
@@ -20,7 +20,7 @@ over different file types (ex: python vs cython vs pyi) you can do so with the f

```yaml
- repo: https://github.com/pycqa/isort
rev: 5.11.3
rev: 5.11.4
hooks:
- id: isort
name: isort (python)
2 changes: 1 addition & 1 deletion isort/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "5.11.3"
__version__ = "5.11.4"
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ line-length = 100

[tool.poetry]
name = "isort"
version = "5.11.3"
version = "5.11.4"
description = "A Python utility / library to sort Python imports."
authors = ["Timothy Crosley <timothy.crosley@gmail.com>"]
license = "MIT"
@@ -34,9 +34,9 @@ classifiers = [
urls = { Changelog = "https://github.com/pycqa/isort/blob/main/CHANGELOG.md" }
include = [
{ path = "tests", format = "sdist" },
{ path = "ACKNOWLEDGEMENTS.md" },
{ path = "CHANGELOG.md" },
{ path = "LICENSE" },
{ path = "ACKNOWLEDGEMENTS.md", format = "sdist" },
{ path = "CHANGELOG.md", format = "sdist" },
{ path = "LICENSE", format = "sdist" },
]

[tool.poetry.dependencies]
2 changes: 0 additions & 2 deletions tests/unit/test_isort.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@

import py
import pytest
import toml

import isort
from isort import api, files, sections
@@ -2713,7 +2712,6 @@ def test_sections_parsed_correct(tmpdir) -> None:
assert isort.code(test_input, settings_path=str(tmpdir)) == correct_output


@pytest.mark.skipif(toml is None, reason="Requires toml package to be installed.")
def test_pyproject_conf_file(tmpdir) -> None:
"""Ensure that modules for custom sections parsed as list from config file and
isort result is correct