🔖 release v1.4.18 (#46)

Author: techouse

mysql_to_sqlite3/__init__.py

@@ -1,4 +1,4 @@
 """Utility to transfer data from MySQL to SQLite 3."""
-__version__ = "1.4.17"
+__version__ = "1.4.18"
 
 from .transporter import MySQLtoSQLite

mysql_to_sqlite3/debug_info.py

@@ -13,7 +13,6 @@
 
 import click
 import mysql.connector
-import pytimeparse
 import simplejson
 import six
 import slugify
@@ -23,6 +22,12 @@
 from . import __version__ as package_version
 
 
+if six.PY2 or (sys.version_info.major == 3 and 4 <= sys.version_info.minor <= 6):
+    import pytimeparse  # pylint: disable=E0401
+else:
+    import pytimeparse2 as pytimeparse
+
+
 def _implementation():
     """Return a dict with the Python implementation and version.
 

mysql_to_sqlite3/sqlite_utils.py

@@ -8,9 +8,13 @@
 from sys import version_info
 
 import six
-from pytimeparse.timeparse import timeparse
 
 
+if six.PY2 or (version_info.major == 3 and 4 <= version_info.minor <= 6):
+    from pytimeparse.timeparse import timeparse  # pylint: disable=E0401
+else:
+    from pytimeparse2 import parse as timeparse
+
 if version_info.major == 3 and 4 <= version_info.minor <= 6:
     from backports.datetime_fromisoformat import MonkeyPatch  # pylint: disable=E0401
 

pyproject.toml

@@ -45,10 +45,12 @@ dependencies = [
     "Click>=7.0,<8.0.0 ; python_version<'3.6'",
     "Click>=7.0 ; python_version>='3.6'",
     "mysql-connector-python>=8.0.18,<8.0.24 ; python_version<'3.6'",
-    "mysql-connector-python>=8.0.18,<8.0.30 ; python_version>='3.6'",
-    "pytimeparse>=1.1.8",
+    "mysql-connector-python>=8.0.18,!=8.0.30,!=8.0.31 ; python_version>='3.6'",
+    "pytimeparse>=1.1.8; python_version<'3.6'",
+    "pytimeparse2; python_version>='3.6'",
     "python-slugify>=3.0.3,<5.0.0 ; python_version<'3.6'",
-    "python-slugify>=3.0.3,<6.0.0 ; python_version>='3.6'",
+    "python-slugify>=5.0.0,<7.0.0 ; python_version>='3.6' and python_version<'3.7'",
+    "python-slugify>=7.0.0 ; python_version>='3.7'",
     "simplejson>=3.16.0",
     "six>=1.12.0",
     "tqdm>=4.35.0",

pytest.ini

@@ -2,7 +2,7 @@
 testpaths = tests
 norecursedirs = .* venv env *.egg dist build
 minversion = 4.6.5
-addopts = -rsxX -l --tb=short --strict
+addopts = -rsxX -l --tb=short --strict-markers
 timeout = 300
 markers =
     init: Run the initialisation test functions

requirements_dev.txt

@@ -4,22 +4,24 @@ docker>=4.0.2
 factory-boy
 Faker>=4.1.0 ; python_version>="3.0"
 mysql-connector-python>=8.0.18,<8.0.24 ; python_version<"3.6"
-mysql-connector-python>=8.0.18,<8.0.30 ; python_version>="3.6"
+mysql-connector-python>=8.0.18,!=8.0.30,!=8.0.31 ; python_version>="3.6"
 mysqlclient>=1.4.6
 pytest>=4.6.5
 pytest-cov
 pytest-faker ; python_version<"3.0"
 pytest-mock
 pytest-timeout
-pytimeparse>=1.1.8
+pytimeparse>=1.1.8 ; python_version<"3.6"
+pytimeparse2 ; python_version>="3.6"
 python-slugify>=3.0.3,<5.0.0 ; python_version<"3.6"
-python-slugify>=3.0.3,<6.0.0 ; python_version>="3.6"
+python-slugify>=5.0.0,<7.0.0 ; python_version>="3.6" and python_version<"3.7"
+python-slugify>=7.0.0 ; python_version>="3.7"
 simplejson>=3.16.0
 six>=1.12.0
 sqlalchemy>=1.3.7,<1.4.0 ; python_version<"3.0"
-sqlalchemy>=1.3.7,<=1.4.44 ; python_version>="3.0"
+sqlalchemy<2.0.0 ; python_version>="3.0"
 sqlalchemy-utils==0.36.6 ; python_version<"3.0"
-sqlalchemy-utils>=0.36.6,<0.40.0 ; python_version>="3.0"
+sqlalchemy-utils>=0.36.6 ; python_version>="3.0"
 tox
 tqdm>=4.35.0
 packaging>=20.3

tests/func/mysql_to_sqlite3_test.py

@@ -441,6 +441,8 @@ def test_transfer_transfers_all_tables_from_mysql_to_sqlite(
         for table_name in sqlite_tables:
             for sqlite_index in sqlite_inspect.get_indexes(table_name):
                 sqlite_index["unique"] = bool(sqlite_index["unique"])
+                if "dialect_options" in sqlite_index:
+                    sqlite_index.pop("dialect_options", None)
                 assert sqlite_index in mysql_indices
 
         """ Test if all the tables have the same foreign keys """
@@ -929,6 +931,8 @@ def test_transfer_specific_tables_transfers_only_specified_tables_from_mysql_to_
         for table_name in sqlite_tables:
             for sqlite_index in sqlite_inspect.get_indexes(table_name):
                 sqlite_index["unique"] = bool(sqlite_index["unique"])
+                if "dialect_options" in sqlite_index:
+                    sqlite_index.pop("dialect_options", None)
                 assert sqlite_index in mysql_indices
 
         """ Check if all the data was transferred correctly """
@@ -1195,6 +1199,8 @@ def test_transfer_limited_rows_from_mysql_to_sqlite(
         for table_name in sqlite_tables:
             for sqlite_index in sqlite_inspect.get_indexes(table_name):
                 sqlite_index["unique"] = bool(sqlite_index["unique"])
+                if "dialect_options" in sqlite_index:
+                    sqlite_index.pop("dialect_options", None)
                 assert sqlite_index in mysql_indices
 
         """ Test if all the tables have the same foreign keys """