Skip to content

Commit

Permalink
👕 Organizing code with iSort and Black.
Browse files Browse the repository at this point in the history
  • Loading branch information
williamcanin committed Sep 10, 2022
1 parent 55d4d6f commit 740a864
Show file tree
Hide file tree
Showing 24 changed files with 79 additions and 83 deletions.
8 changes: 4 additions & 4 deletions snakypy/dotctrl/actions/config.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import pydoc
from os import environ
from os.path import join, exists
from os.path import exists, join
from shutil import which
from subprocess import call
from sys import exit
from typing import Union, Any
from typing import Any, Union

from snakypy.helpers import printer
from snakypy.helpers.files import read_file, create_json, read_json
from snakypy.dotctrl.utils import pick
from snakypy.helpers.files import create_json, read_file, read_json

from snakypy.dotctrl.config.base import Base
from snakypy.dotctrl.utils import pick


def editor_run(editor, config):
Expand Down
2 changes: 1 addition & 1 deletion snakypy/dotctrl/actions/find.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from os import walk
from os.path import join, isdir
from os.path import isdir, join
from pydoc import pager

from snakypy.helpers import printer
Expand Down
10 changes: 3 additions & 7 deletions snakypy/dotctrl/actions/link.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
from genericpath import isfile
from os.path import join, exists, islink
from os.path import exists, islink, join

from genericpath import isfile
from snakypy.helpers import printer

from snakypy.dotctrl.config.base import Base, Options
from snakypy.dotctrl.utils import (
create_symlink,
path_creation,
is_repo_symbolic_link,
)
from snakypy.dotctrl.utils import create_symlink, is_repo_symbolic_link, path_creation


class LinkCommand(Base, Options):
Expand Down
11 changes: 4 additions & 7 deletions snakypy/dotctrl/actions/pull.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
from genericpath import isfile
from os.path import exists, islink, join

from genericpath import isfile
from snakypy.helpers import printer

from snakypy.dotctrl.config.base import Base, Options
from snakypy.dotctrl.utils import (
add_element_config,
join_two,
path_creation,
to_move,
)
from snakypy.dotctrl.utils import add_element_config, join_two, path_creation, to_move


def pulled_to_do(data: list, home_path: str) -> list:
Expand Down
7 changes: 3 additions & 4 deletions snakypy/dotctrl/actions/repo.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
from os import environ, listdir
from os import environ, listdir, walk
from os.path import exists, isdir, join
from pydoc import pager
from textwrap import dedent
from typing import Any
from os import walk

from snakypy.helpers import FG, SGR, printer
from snakypy.helpers.ansi import NONE
from snakypy.helpers.checking import whoami

from snakypy.dotctrl import __info__
from snakypy.dotctrl.config.base import Base
from snakypy.dotctrl.utils import listing_files, is_repo_symbolic_link
from snakypy.helpers.checking import whoami
from snakypy.dotctrl.utils import is_repo_symbolic_link, listing_files


class RepoCommand(Base):
Expand Down
11 changes: 5 additions & 6 deletions snakypy/dotctrl/actions/restore.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
from genericpath import isdir, isfile
from os.path import exists, join, islink
from os.path import exists, islink, join
from shutil import move


from snakypy.helpers.os import rmdir_blank
from genericpath import isdir, isfile
from snakypy.helpers import printer
from snakypy.helpers.os import rmdir_blank

from snakypy.dotctrl.config.base import Base, Options
from snakypy.dotctrl.utils import (
is_repo_symbolic_link,
listing_files,
path_creation,
pick,
remove_objects,
is_repo_symbolic_link,
)
from snakypy.dotctrl.utils import pick


class RestoreCommand(Base, Options):
Expand Down
10 changes: 4 additions & 6 deletions snakypy/dotctrl/actions/unlink.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from contextlib import suppress
from os import remove
from os.path import islink, join, exists
from os.path import exists, islink, join

from snakypy.dotctrl.config.base import Base, Options
from snakypy.helpers import printer
from snakypy.dotctrl.utils import (
join_two,
is_repo_symbolic_link,
)

from snakypy.dotctrl.config.base import Base, Options
from snakypy.dotctrl.utils import is_repo_symbolic_link, join_two


def unlinks_to_do(data: list, repo_dir: str, home_dir: str):
Expand Down
4 changes: 1 addition & 3 deletions snakypy/dotctrl/config/base.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
"""Modulate to store records and data."""
from contextlib import suppress
from genericpath import exists
from os.path import join

from genericpath import exists
from snakypy.helpers import printer
from snakypy.helpers.files import read_json

from snakypy.dotctrl import __info__

from snakypy.dotctrl.utils import get_key

from snakypy.dotctrl.utils.messages import Messages


Expand Down
9 changes: 4 additions & 5 deletions snakypy/dotctrl/config/menu.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
"""Module menu"""

from os.path import exists
from typing import Any

from docopt import docopt
from snakypy.helpers import FG
from snakypy.helpers.ansi import NONE

from snakypy.dotctrl import __info__

from snakypy.dotctrl.config.base import Base
from snakypy.dotctrl.utils import get_key
from os.path import exists
from docopt import docopt
from typing import Any


EN_US: str = f"""
{__info__['name']} version: {FG().CYAN}{__info__['version']}{NONE}
Expand Down
2 changes: 1 addition & 1 deletion snakypy/dotctrl/dotctrl.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
from snakypy.dotctrl.actions.repo import RepoCommand
from snakypy.dotctrl.actions.restore import RestoreCommand
from snakypy.dotctrl.actions.unlink import UnlinkCommand
from snakypy.dotctrl.config.menu import Menu

# from snakypy.dotctrl.utils import arguments
from snakypy.dotctrl.utils.decorators import assign_cli

# from textwrap import dedent

from snakypy.dotctrl.config.menu import Menu

# Get arguments Docopt
args: dict = Menu(ROOT, HOME).args()
Expand Down
6 changes: 3 additions & 3 deletions snakypy/dotctrl/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from .catch import listing_files # noqa
from .checking import get_key, is_repo_symbolic_link # noqa
from .dialog import pick # noqa
from .checking import is_repo_symbolic_link, get_key # noqa
from .path import join_two, path_creation, shorten_path # noqa
from .process import git_init_command # noqa
from .modifiers import ( # noqa
add_element_config,
create_symlink,
remove_objects,
to_move,
)
from .path import join_two, path_creation, shorten_path # noqa
from .process import git_init_command # noqa
2 changes: 1 addition & 1 deletion snakypy/dotctrl/utils/checking.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from os.path import realpath
from functools import reduce
from os.path import realpath
from typing import Union


Expand Down
2 changes: 1 addition & 1 deletion snakypy/dotctrl/utils/colors.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from snakypy.helpers import FG, SGR, NONE
from snakypy.helpers import FG, NONE, SGR


class Colors:
Expand Down
3 changes: 1 addition & 2 deletions snakypy/dotctrl/utils/dialog.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from snakypy.helpers import FG, NONE
from snakypy.helpers import printer
from snakypy.helpers import FG, NONE, printer


def pick_options(
Expand Down
8 changes: 5 additions & 3 deletions snakypy/dotctrl/utils/messages.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from contextlib import suppress
from os.path import realpath

from snakypy.helpers import printer
from snakypy.dotctrl.config.lang import LANG
from snakypy.helpers.files import read_json

from snakypy.dotctrl.config.lang import LANG
from snakypy.dotctrl.utils import get_key
from snakypy.dotctrl.utils.colors import Colors
from contextlib import suppress
from os.path import realpath


class Messages(Colors):
Expand Down
3 changes: 2 additions & 1 deletion tests/test_arguments.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from .utilities import Basic, fixture # noqa: E261,F401
from snakypy.dotctrl.utils.decorators import assign_cli

from .utilities import Basic, fixture # noqa: E261,F401


class ArgsTester:
def __init__(self, fixt): # noqa: F811
Expand Down
5 changes: 3 additions & 2 deletions tests/test_find.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from .utilities import Basic, fixture # noqa: E261,F401
from snakypy.dotctrl.actions.find import FindCommand

from .test_init import InitTester
from .test_pull import PullTester
from snakypy.dotctrl.actions.find import FindCommand
from .utilities import Basic, fixture # noqa: E261,F401


class FindTester(Basic):
Expand Down
1 change: 0 additions & 1 deletion tests/test_init.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from os.path import exists


from snakypy.dotctrl.actions.init import InitCommand
from snakypy.dotctrl.actions.repo import RepoCommand

Expand Down
14 changes: 8 additions & 6 deletions tests/test_link.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from .utilities import Basic, fixture # noqa: E261,F401
from .test_pull import PullTester
from .test_init import InitTester
from snakypy.dotctrl.actions.link import LinkCommand
from os import remove, symlink
from os.path import join
from snakypy.dotctrl.utils import is_repo_symbolic_link
from shutil import copyfile
from os import remove, symlink

from snakypy.dotctrl.actions.link import LinkCommand
from snakypy.dotctrl.utils import is_repo_symbolic_link

from .test_init import InitTester
from .test_pull import PullTester
from .utilities import Basic, fixture # noqa: E261,F401


class LinkTester(Basic):
Expand Down
10 changes: 6 additions & 4 deletions tests/test_pull.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from .utilities import Basic, fixture # noqa: E261,F401
from .test_init import InitTester
from snakypy.dotctrl.actions.pull import PullCommand
from os import remove
from os.path import exists, join
from shutil import copyfile
from os import remove

from snakypy.dotctrl.actions.pull import PullCommand

from .test_init import InitTester
from .utilities import Basic, fixture # noqa: E261,F401


class PullTester(Basic):
Expand Down
12 changes: 7 additions & 5 deletions tests/test_repo.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from os import symlink, remove
from .utilities import Basic, fixture # noqa: E261,F401
from .test_pull import PullTester
from os import remove, symlink
from os.path import join

from snakypy.dotctrl.actions.repo import RepoCommand

from .test_init import InitTester
from .test_link import LinkTester
from snakypy.dotctrl.actions.repo import RepoCommand
from os.path import join
from .test_pull import PullTester
from .utilities import Basic, fixture # noqa: E261,F401


class RepoTester(Basic):
Expand Down
10 changes: 6 additions & 4 deletions tests/test_restore.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from .utilities import Basic, fixture # noqa: E261,F401
from os.path import exists, join

from snakypy.dotctrl.actions.restore import RestoreCommand

from .test_init import InitTester
from .test_pull import PullTester
from .test_link import LinkTester
from snakypy.dotctrl.actions.restore import RestoreCommand
from os.path import exists, join
from .test_pull import PullTester
from .utilities import Basic, fixture # noqa: E261,F401

# from unittest.mock import patch

Expand Down
7 changes: 4 additions & 3 deletions tests/test_unlink.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from .utilities import Basic, fixture # noqa: E261,F401
from .test_link import LinkTester
from snakypy.dotctrl.actions.unlink import UnlinkCommand

from .test_init import InitTester
from .test_link import LinkTester
from .test_pull import PullTester
from snakypy.dotctrl.actions.unlink import UnlinkCommand
from .utilities import Basic, fixture # noqa: E261,F401


class UnlinkTester(Basic):
Expand Down
5 changes: 2 additions & 3 deletions tests/utilities.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from os.path import join

import pytest
from snakypy.helpers.files import create_file, update_json, read_json
from snakypy.helpers.files import create_file, read_json, update_json
from snakypy.helpers.path import create as create_path

from snakypy.dotctrl.config.base import Base
from snakypy.dotctrl.utils import path_creation

from snakypy.dotctrl.config.menu import Menu
from snakypy.dotctrl.utils import path_creation


def populate_home(path: str) -> dict:
Expand Down

0 comments on commit 740a864

Please sign in to comment.