Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions efiction/chapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
from pathlib import Path
from typing import List

from opendoors.mysql import SqlDb
from opendoors.big_insert import BigInsert
from opendoors.mysql import SqlDb
from opendoors.utils import (
get_full_path,
get_prefixed_path,
key_find,
make_banner,
normalize,
print_progress,
make_banner,
key_find,
get_prefixed_path,
)


Expand Down
12 changes: 6 additions & 6 deletions efiction/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
from unidecode import unidecode

from efiction.tag_converter import TagConverter
from opendoors.big_insert import BigInsert
from opendoors.mysql import SqlDb
from opendoors.sql_utils import (
add_create_database,
parse_remove_comments,
write_statements_to_file,
add_create_database,
)
from opendoors.thread_pool import ThreadedPool
from opendoors.utils import (
print_progress,
get_full_path,
normalize,
key_find,
get_prefixed_path,
key_find,
normalize,
print_progress,
)
from opendoors.thread_pool import ThreadedPool
from opendoors.big_insert import BigInsert


class EFictionMetadata:
Expand Down
8 changes: 4 additions & 4 deletions efiction/original.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
from efiction.eFiction_table_defs import create_def
from opendoors.mysql import SqlDb
from opendoors.sql_utils import (
write_statements_to_file,
parse_remove_comments,
group_by_table,
add_create_database,
group_by_table,
parse_remove_comments,
write_statements_to_file,
)
from opendoors.utils import (
copy_to_dir,
check_if_file_exists,
copy_to_dir,
get_full_path,
get_prefixed_path,
)
Expand Down
2 changes: 1 addition & 1 deletion efiction/simplified.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

from opendoors.mysql import SqlDb
from opendoors.sql_utils import (
group_by_table,
add_create_database,
group_by_table,
parse_remove_comments,
write_statements_to_file,
)
Expand Down
1 change: 0 additions & 1 deletion efiction/tag_converter.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from configparser import ConfigParser
from logging import Logger

from typing import Dict, List

from opendoors.mysql import SqlDb
Expand Down
4 changes: 2 additions & 2 deletions efiction/tests/test_chapters.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import json
import copy
import json
from unittest.mock import MagicMock, patch
import pytest

import pytest

from efiction.chapters import EFictionChapters
from opendoors.config import ArchiveConfig
Expand Down
2 changes: 1 addition & 1 deletion efiction/tests/test_metadata.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import datetime
from unittest import TestCase

from efiction.tests.test_utils import load_fixtures, create_efiction_converter
from efiction.tests.test_utils import create_efiction_converter, load_fixtures
from opendoors.utils import remove_output_files


Expand Down
5 changes: 3 additions & 2 deletions opendoors/big_insert.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from .mysql import SqlDb
from tempfile import NamedTemporaryFile
from os import unlink
from tempfile import NamedTemporaryFile

from .mysql import SqlDb


class BigInsert:
Expand Down
2 changes: 1 addition & 1 deletion opendoors/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"""
import logging
import os

import sys

from colorlog import ColoredFormatter


Expand Down
2 changes: 1 addition & 1 deletion opendoors/step_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from logging import Logger

from opendoors.mysql import SqlDb
from opendoors.utils import make_banner, get_prefixed_path
from opendoors.utils import get_prefixed_path, make_banner


@dataclass
Expand Down
4 changes: 2 additions & 2 deletions opendoors/tests/test_progress.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from unittest import TestCase
from unittest.mock import patch, MagicMock
from unittest.mock import MagicMock, patch

from opendoors.config import ArchiveConfig
from opendoors.progress import continue_from_last, update_done_steps, get_next_step
from opendoors.progress import continue_from_last, get_next_step, update_done_steps
from opendoors.step_base import StepBase, StepInfo
from opendoors.utils import remove_output_files

Expand Down
2 changes: 1 addition & 1 deletion opendoors/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from unittest import TestCase
from unittest.mock import patch

from opendoors.utils import make_banner, set_working_dir, get_prefixed_path
from opendoors.utils import get_prefixed_path, make_banner, set_working_dir


class UtilsTest(TestCase):
Expand Down
5 changes: 2 additions & 3 deletions opendoors/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
import os
import re
import shutil
from typing import Mapping
from pathlib import Path

import unicodedata
from pathlib import Path
from typing import Mapping


def get_full_path(path):
Expand Down
1 change: 0 additions & 1 deletion start.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/python3
import atexit
import configparser

import sys

from opendoors import progress
Expand Down
Loading