Skip to content

Commit 54b1723

Browse files
committed
🚑 Pin mysql-connector-python to <8.0.30
1 parent 3ce0591 commit 54b1723

File tree

8 files changed

+15
-17
lines changed

8 files changed

+15
-17
lines changed

mysql_to_sqlite3/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
__title__ = "mysql-to-sqlite3"
33
__description__ = "A simple Python tool to transfer data from MySQL to SQLite 3"
44
__url__ = "https://github.com/techouse/mysql-to-sqlite3"
5-
__version__ = "1.4.13"
5+
__version__ = "1.4.14"
66
__author__ = "Klemen Tusar"
77
__author_email__ = "techouse@gmail.com"
88
__license__ = "MIT"

mysql_to_sqlite3/debug_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import platform
99
import sqlite3
1010
import sys
11-
from distutils.spawn import find_executable
11+
from distutils.spawn import find_executable # pylint: disable=W0402
1212
from subprocess import check_output
1313

1414
import click

mysql_to_sqlite3/transporter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ def _create_table(self, table_name, attempting_reconnect=False):
412412
if err.errno == errorcode.CR_SERVER_LOST:
413413
if not attempting_reconnect:
414414
self._logger.warning(
415-
"Connection to MySQL server lost." "\nAttempting to reconnect."
415+
"Connection to MySQL server lost.\nAttempting to reconnect."
416416
)
417417
self._create_table(table_name, True)
418418
else:
@@ -474,7 +474,7 @@ def _transfer_table_data(
474474
if err.errno == errorcode.CR_SERVER_LOST:
475475
if not attempting_reconnect:
476476
self._logger.warning(
477-
"Connection to MySQL server lost." "\nAttempting to reconnect."
477+
"Connection to MySQL server lost.\nAttempting to reconnect."
478478
)
479479
self._transfer_table_data(
480480
table_name=table_name,

requirements_dev.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ docker>=4.0.2
44
factory-boy
55
Faker>=4.1.0 ; python_version>="3.0"
66
mysql-connector-python>=8.0.18,<8.0.24 ; python_version<"3.6"
7-
mysql-connector-python>=8.0.18 ; python_version>="3.6"
7+
mysql-connector-python>=8.0.18,<8.0.30 ; python_version>="3.6"
88
mysqlclient>=1.4.6
99
pytest>=4.6.5
1010
pytest-cov
@@ -16,7 +16,8 @@ python-slugify>=3.0.3,<5.0.0 ; python_version<"3.6"
1616
python-slugify>=3.0.3,<6.0.0 ; python_version>="3.6"
1717
simplejson>=3.16.0
1818
six>=1.12.0
19-
sqlalchemy>=1.3.7,<1.4.0
19+
sqlalchemy>=1.3.7,<1.4.0 ; python_version<"3.0"
20+
sqlalchemy>=1.3.7 ; python_version>="3.0"
2021
sqlalchemy-utils==0.36.6 ; python_version<"3.0"
2122
sqlalchemy-utils>=0.36.6 ; python_version>="3.0"
2223
tox

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
ignore = D203,D401,W503,E203,F401,F403
2+
ignore = I100,I201,I202,D203,D401,W503,E203,F401,F403,C901,E501
33
exclude = tests
44
max-line-length = 88
55

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Click>=7.0,<8.0.0 ; python_version<'3.6'",
1212
"Click>=7.0 ; python_version>='3.6'",
1313
"mysql-connector-python>=8.0.18,<8.0.24 ; python_version<'3.6'",
14-
"mysql-connector-python>=8.0.18 ; python_version>='3.6'",
14+
"mysql-connector-python>=8.0.18,<8.0.30 ; python_version>='3.6'",
1515
"pytimeparse>=1.1.8",
1616
"python-slugify>=3.0.3,<5.0.0 ; python_version<'3.6'",
1717
"python-slugify>=3.0.3,<6.0.0 ; python_version>='3.6'",

tests/unit/mysql_to_sqlite3_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_translate_type_from_mysql_to_sqlite_all_valid_columns(self):
3333
"NVARCHAR(17)",
3434
"VARCHAR(123)",
3535
):
36-
if column_type in {"dialect", "insert", "Insert"}:
36+
if any(c for c in column_type if c.islower()):
3737
continue
3838
elif column_type == "INT":
3939
assert (

tox.ini

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,16 @@ deps =
9191
commands =
9292
python setup.py check --metadata --strict
9393

94-
# Flake8 Configuration
9594
[flake8]
96-
# Ignore some flake8-docstrings errors
97-
# NOTE(sigmavirus24): While we're still using flake8 2.x, this ignore line
98-
# defaults to selecting all other errors so we do not need select=E,F,W,I,D
99-
# Once Flake8 3.0 is released and in a good state, we can use both and it will
100-
# work well \o/
101-
ignore = I100,I202,D203,D401,W503,E203,F401,F403,C901,E501
95+
ignore = I100,I201,I202,D203,D401,W503,E203,F401,F403,C901,E501
10296
exclude =
10397
*__init__.py
10498
*__version__.py
10599
.tox
106100
max-complexity = 10
107101
max-line-length = 88
108102
import-order-style = pycharm
109-
application-import-names = flake8
103+
application-import-names = flake8
104+
105+
[pylint]
106+
disable = C0209,C0301,C0411,R,W0107,W0622

0 commit comments

Comments
 (0)