🎨 black & isort (#68)

Author: techouse

.github/workflows/test.yml

@@ -2,12 +2,33 @@ name: Test
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+defaults:
+  run:
+    shell: bash
+permissions: read-all
 
 jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          pip install -r requirements_dev.txt
+      - name: Run static analysis
+        run: tox -e linters
   test:
+    needs: analyze
     runs-on: ubuntu-latest
     strategy:
       matrix:

pyproject.toml

@@ -73,4 +73,33 @@ license-files = ["LICENSE"]
 universal = true
 
 [project.scripts]
-sqlite3mysql = "sqlite3_to_mysql.cli:cli"
+sqlite3mysql = "sqlite3_to_mysql.cli:cli"
+
+[tool.black]
+line-length = 120
+target-version = ["py35", "py36", "py37", "py38", "py39", "py310", "py311"]
+include = '\.pyi?$'
+exclude = '''
+(
+    /(
+        \.eggs
+        | \.git
+        | \.hg
+        | \.mypy_cache
+        | \.tox
+        | \.venv
+        | _build
+        | buck-out
+        | build
+        | dist
+    )/
+    | foo.py
+)
+'''
+
+[tool.isort]
+line_length = 120
+profile = "black"
+lines_after_imports = 2
+known_first_party = "sqlite3_to_mysql"
+skip_gitignore = true

sqlite3_to_mysql/cli.py

@@ -9,11 +9,7 @@
 from . import SQLite3toMySQL
 from .click_utils import OptionEatAll, prompt_password
 from .debug_info import info
-from .mysql_utils import (
-    MYSQL_INSERT_METHOD,
-    MYSQL_TEXT_COLUMN_TYPES,
-    mysql_supported_character_sets,
-)
+from .mysql_utils import MYSQL_INSERT_METHOD, MYSQL_TEXT_COLUMN_TYPES, mysql_supported_character_sets
 
 
 @click.command()
@@ -33,19 +29,15 @@
     help="Transfer only these specific tables (space separated table names). "
     "Implies --without-foreign-keys which inhibits the transfer of foreign keys.",
 )
-@click.option(
-    "-X", "--without-foreign-keys", is_flag=True, help="Do not transfer foreign keys."
-)
+@click.option("-X", "--without-foreign-keys", is_flag=True, help="Do not transfer foreign keys.")
 @click.option(
     "-W",
     "--ignore-duplicate-keys",
     is_flag=True,
     help="Ignore duplicate keys. The default behavior is to create new ones with a numerical suffix, e.g. "
     "'exising_key' -> 'existing_key_1'",
 )
-@click.option(
-    "-d", "--mysql-database", default=None, help="MySQL database name", required=True
-)
+@click.option("-d", "--mysql-database", default=None, help="MySQL database name", required=True)
 @click.option("-u", "--mysql-user", default=None, help="MySQL user", required=True)
 @click.option(
     "-p",
@@ -56,15 +48,9 @@
     help="Prompt for MySQL password",
 )
 @click.option("--mysql-password", default=None, help="MySQL password")
-@click.option(
-    "-h", "--mysql-host", default="localhost", help="MySQL host. Defaults to localhost."
-)
-@click.option(
-    "-P", "--mysql-port", type=int, default=3306, help="MySQL port. Defaults to 3306."
-)
-@click.option(
-    "-S", "--skip-ssl", is_flag=True, help="Disable MySQL connection encryption."
-)
+@click.option("-h", "--mysql-host", default="localhost", help="MySQL host. Defaults to localhost.")
+@click.option("-P", "--mysql-port", type=int, default=3306, help="MySQL port. Defaults to 3306.")
+@click.option("-S", "--skip-ssl", is_flag=True, help="Disable MySQL connection encryption.")
 @click.option(
     "-i",
     "--mysql-insert-method",
@@ -124,15 +110,11 @@
     "Will throw an error if your MySQL version does not support InnoDB FULLTEXT indexes!",
 )
 @click.option("--with-rowid", is_flag=True, help="Transfer rowid columns.")
-@click.option(
-    "-c", "--chunk", type=int, default=None, help="Chunk reading/writing SQL records"
-)
+@click.option("-c", "--chunk", type=int, default=None, help="Chunk reading/writing SQL records")
 @click.option("-l", "--log-file", type=click.Path(), help="Log file")
 @click.option("-q", "--quiet", is_flag=True, help="Quiet. Display only errors.")
 @click.option("--debug", is_flag=True, help="Debug mode. Will throw exceptions.")
-@click.version_option(
-    message=tabulate(info(), headers=["software", "version"], tablefmt="github")
-)
+@click.version_option(message=tabulate(info(), headers=["software", "version"], tablefmt="github"))
 def cli(
     sqlite_file,
     sqlite_tables,
@@ -162,10 +144,7 @@ def cli(
     """Transfer SQLite to MySQL using the provided CLI options."""
     try:
         if mysql_collation:
-            charset_collations = tuple(
-                cs.collation
-                for cs in mysql_supported_character_sets(mysql_charset.lower())
-            )
+            charset_collations = tuple(cs.collation for cs in mysql_supported_character_sets(mysql_charset.lower()))
             if mysql_collation not in set(charset_collations):
                 raise click.ClickException(
                     "Error: Invalid value for '--collation' of charset '{charset}': '{collation}' is not one of "
@@ -179,8 +158,7 @@ def cli(
         converter = SQLite3toMySQL(
             sqlite_file=sqlite_file,
             sqlite_tables=sqlite_tables,
-            without_foreign_keys=without_foreign_keys
-            or (sqlite_tables is not None and len(sqlite_tables) > 0),
+            without_foreign_keys=without_foreign_keys or (sqlite_tables is not None and len(sqlite_tables) > 0),
             mysql_user=mysql_user,
             mysql_password=mysql_password or prompt_mysql_password,
             mysql_database=mysql_database,

sqlite3_to_mysql/click_utils.py

@@ -40,9 +40,7 @@ def parser_process(value, state):
             # call the actual process
             self._previous_parser_process(value, state)
 
-        retval = super(OptionEatAll, self).add_to_parser(  # pylint: disable=E1111
-            parser, ctx
-        )
+        retval = super(OptionEatAll, self).add_to_parser(parser, ctx)  # pylint: disable=E1111
         for name in self.opts:
             # pylint: disable=W0212
             our_parser = parser._long_opt.get(name) or parser._short_opt.get(name)

sqlite3_to_mysql/debug_info.py

@@ -43,9 +43,7 @@ def _implementation():
             sys.pypy_version_info.minor,  # noqa: ignore=E1101 pylint: disable=E1101
             sys.pypy_version_info.micro,  # noqa: ignore=E1101 pylint: disable=E1101
         )
-        rel = (
-            sys.pypy_version_info.releaselevel  # noqa: ignore=E1101 pylint: disable=E1101
-        )
+        rel = sys.pypy_version_info.releaselevel  # noqa: ignore=E1101 pylint: disable=E1101
         if rel != "final":
             implementation_version = "".join([implementation_version, rel])
     elif implementation == "Jython":

sqlite3_to_mysql/mysql_utils.py

@@ -6,6 +6,7 @@
 from mysql.connector.charsets import MYSQL_CHARACTER_SETS
 from packaging import version
 
+
 # Shamelessly copied from SQLAlchemy's dialects/mysql/__init__.py
 MYSQL_COLUMN_TYPES = {
     "BIGINT",
@@ -103,11 +104,7 @@ def check_mysql_json_support(version_string):
     """Check for MySQL JSON support."""
     mysql_version = get_mysql_version(version_string)
     if version_string.lower().endswith("-mariadb"):
-        if (
-            mysql_version.major >= 10
-            and mysql_version.minor >= 2
-            and mysql_version.micro >= 7
-        ):
+        if mysql_version.major >= 10 and mysql_version.minor >= 2 and mysql_version.micro >= 7:
             return True
     else:
         if mysql_version.major >= 8:
@@ -121,11 +118,7 @@ def check_mysql_fulltext_support(version_string):
     """Check for FULLTEXT indexing support."""
     mysql_version = get_mysql_version(version_string)
     if version_string.lower().endswith("-mariadb"):
-        if (
-            mysql_version.major >= 10
-            and mysql_version.minor >= 0
-            and mysql_version.micro >= 5
-        ):
+        if mysql_version.major >= 10 and mysql_version.minor >= 0 and mysql_version.micro >= 5:
             return True
     else:
         if mysql_version.major >= 8:

sqlite3_to_mysql/sqlite_utils.py

@@ -7,9 +7,10 @@
 from sys import version_info
 
 import six
+from packaging import version
 from pytimeparse.timeparse import timeparse
 from unidecode import unidecode
-from packaging import version
+
 
 if version_info.major == 3 and 4 <= version_info.minor <= 6:
     from backports.datetime_fromisoformat import MonkeyPatch  # pylint: disable=E0401
@@ -57,22 +58,16 @@ def convert_date(value):
         try:
             return date.fromisoformat(value.decode())
         except ValueError as err:
-            raise ValueError(  # pylint: disable=W0707
-                "DATE field contains {}".format(err)
-            )
+            raise ValueError("DATE field contains {}".format(err))  # pylint: disable=W0707
     try:
         return datetime.strptime(value.decode(), "%Y-%m-%d").date()
     except ValueError as err:
-        raise ValueError(  # pylint: disable=W0707
-            "DATE field contains Invalid isoformat string: {}".format(err)
-        )
+        raise ValueError("DATE field contains Invalid isoformat string: {}".format(err))  # pylint: disable=W0707
 
 
 def check_sqlite_table_xinfo_support(version_string):
     """Check for SQLite table_xinfo support."""
     sqlite_version = version.parse(version_string)
-    if sqlite_version.major > 3 or (
-        sqlite_version.major == 3 and sqlite_version.minor >= 26
-    ):
+    if sqlite_version.major > 3 or (sqlite_version.major == 3 and sqlite_version.minor >= 26):
         return True
     return False