Skip to content

Commit

Permalink
Install isort
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasgeiter committed Mar 10, 2024
1 parent 9f953f7 commit 7d32a2e
Show file tree
Hide file tree
Showing 21 changed files with 55 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
run: poetry install
- name: Check formatting
run: poetry run black --check .
- name: Check import order
run: poetry run isort --check-only .
test:
name: Test
runs-on: ${{ matrix.os }}
Expand Down
4 changes: 2 additions & 2 deletions mkdocs_awesome_pages_plugin/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
import re
from enum import Enum
from pathlib import PurePath
from typing import Optional, List, Union, Any, Iterator
from typing import Any, Iterator, List, Optional, Union

from mkdocs.structure.files import Files
import yaml
from mkdocs.structure.files import Files
from wcmatch import glob


Expand Down
13 changes: 6 additions & 7 deletions mkdocs_awesome_pages_plugin/navigation.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
import warnings
from typing import Dict, List, Optional, Set, Union

import mkdocs.utils
import mkdocs.utils.meta
from natsort import natsort_keygen
from typing import List, Optional, Union, Set, Dict

from mkdocs.structure.files import Files
from mkdocs.structure.nav import Link
from mkdocs.structure.nav import Navigation as MkDocsNavigation
from mkdocs.structure.nav import (
Navigation as MkDocsNavigation,
Section,
Link,
_add_parent_links,
_add_previous_and_next_links,
)
from mkdocs.structure.files import Files
from mkdocs.structure.pages import Page
from natsort import natsort_keygen

from .meta import Meta, MetaNavItem, MetaNavRestItem, RestItemList
from .options import Options
from .utils import dirname, basename, join_paths
from .utils import basename, dirname, join_paths

NavigationItem = Union[Page, Section, Link]

Expand Down
19 changes: 8 additions & 11 deletions mkdocs_awesome_pages_plugin/plugin.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
import glob
import os.path
import warnings
import glob
from typing import List, Dict
from typing import Dict, List

from mkdocs.config import config_options, Config
from mkdocs.config import Config, config_options
from mkdocs.plugins import BasePlugin
from mkdocs.structure.files import Files, File
from mkdocs.structure.nav import (
Navigation as MkDocsNavigation,
get_navigation,
Section,
Link,
)
from mkdocs.structure.files import File, Files
from mkdocs.structure.nav import Link
from mkdocs.structure.nav import Navigation as MkDocsNavigation
from mkdocs.structure.nav import Section, get_navigation
from mkdocs.structure.pages import Page

from .meta import DuplicateRestItemError, MetaNavRestItem, RestItemList
from .navigation import AwesomeNavigation, get_by_type, NavigationItem
from .navigation import AwesomeNavigation, NavigationItem, get_by_type
from .options import Options


Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/e2e/base.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import tempfile
import warnings
from typing import Iterable, Optional, List, Tuple, Union, Dict, TypeVar
from typing import Dict, Iterable, List, Optional, Tuple, TypeVar, Union
from unittest import TestCase

import yaml
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/e2e/test_arrange.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .base import E2ETestCase
from ...navigation import NavEntryNotFound
from .base import E2ETestCase


class TestArrange(E2ETestCase):
Expand Down
1 change: 1 addition & 0 deletions mkdocs_awesome_pages_plugin/tests/e2e/test_hide.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from mkdocs_awesome_pages_plugin.navigation import HideInRootHasNoEffect

from .base import E2ETestCase


Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/e2e/test_mkdocs_nav.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import pytest
from mkdocs import __version__ as mkdocs_version

from .base import E2ETestCase
from ...meta import DuplicateRestItemError
from ...navigation import NavEntryNotFound
from .base import E2ETestCase


class TestMkdocsNav(E2ETestCase):
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/e2e/test_nav.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .base import E2ETestCase
from ...meta import DuplicateRestItemError
from ...navigation import NavEntryNotFound
from .base import E2ETestCase


class TestNav(E2ETestCase):
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/e2e/test_title.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .base import E2ETestCase
from ...navigation import TitleInRootHasNoEffect
from .base import E2ETestCase


class TestPageTitle(E2ETestCase):
Expand Down
8 changes: 4 additions & 4 deletions mkdocs_awesome_pages_plugin/tests/navigation/base.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import os.path
from typing import List, Union, Optional
from typing import List, Optional, Union
from unittest import TestCase, mock

from mkdocs.structure.files import File, Files
from mkdocs.structure.nav import Link
from mkdocs.structure.nav import Navigation as MkDocsNavigation
from mkdocs.structure.nav import (
Navigation as MkDocsNavigation,
Section,
Link,
_add_parent_links,
_add_previous_and_next_links,
)
from mkdocs.structure.pages import Page

from ...meta import Meta
from ...navigation import NavigationItem, AwesomeNavigation, get_by_type
from ...navigation import AwesomeNavigation, NavigationItem, get_by_type
from ...options import Options


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .base import NavigationTestCase
from ...meta import Meta
from ...navigation import NavEntryNotFound
from .base import NavigationTestCase


class TestArrange(NavigationTestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .base import NavigationTestCase
from ...meta import Meta
from .base import NavigationTestCase


class TestCollapseGlobalDisabled(NavigationTestCase):
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/navigation/test_hide.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .base import NavigationTestCase
from ...meta import Meta
from ...navigation import HideInRootHasNoEffect
from .base import NavigationTestCase


class TestHide(NavigationTestCase):
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/navigation/test_meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
from mkdocs.structure.nav import Section
from mkdocs.structure.pages import Page

from .base import NavigationTestCase
from ...meta import Meta, MetaNavRestItem, RestType
from ...navigation import NavigationItem, NavigationMeta
from ...options import Options
from ...utils import normpath
from .base import NavigationTestCase


class TestCommonDirname(TestCase):
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/navigation/test_nav.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .base import NavigationTestCase
from ...meta import Meta, MetaNavItem, MetaNavRestItem
from ...navigation import NavEntryNotFound
from .base import NavigationTestCase


class TestNav(NavigationTestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .base import NavigationTestCase
from ...meta import Meta, MetaNavItem, MetaNavRestItem
from .base import NavigationTestCase


class TestOrderAndSort(NavigationTestCase):
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/navigation/test_title.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .base import NavigationTestCase
from ...meta import Meta
from ...navigation import TitleInRootHasNoEffect
from .base import NavigationTestCase


class TestTitle(NavigationTestCase):
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_awesome_pages_plugin/tests/test_meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from mkdocs.structure.files import File, Files

from ..meta import Meta, DuplicateRestItemError, MetaNavItem, MetaNavRestItem
from ..meta import DuplicateRestItemError, Meta, MetaNavItem, MetaNavRestItem
from .file_mock import FileMock


Expand Down
16 changes: 15 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,14 @@ pytest = "^8.1.1"
beautifulsoup4 = "^4.12.3"
mock-open = "^1.4.0"
black = { extras = ["d"], version = "^24.2.0" }
isort = "^5.13.2"

[tool.black]
line-length = 120

[tool.isort]
profile = "black"

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

0 comments on commit 7d32a2e

Please sign in to comment.