Merge pull request #69 from techouse/chore/drop-python2

# 2.0.0

* [CHORE] drop support for Python 2.7, 3.5 and 3.6
* [CHORE] migrate pytest.ini configuration into pyproject.toml
* [CHORE] migrate from setuptools to hatch / hatchling
* [CHORE] add types
* [CHORE] add types to tests
* [CHORE] update dependencies
* [CHORE] use f-strings where appropriate

Author: techouse

.github/workflows/test.yml

@@ -33,12 +33,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - toxenv: "python2.7"
-            db: "mariadb:5.5"
-            legacy_db: 1
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:5.5"
             legacy_db: 1
@@ -69,12 +63,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.0"
-            legacy_db: 1
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.0"
             legacy_db: 1
@@ -105,12 +93,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.1"
-            legacy_db: 1
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.1"
             legacy_db: 1
@@ -141,12 +123,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.2"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.2"
             legacy_db: 0
@@ -177,12 +153,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.3"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.3"
             legacy_db: 0
@@ -213,12 +183,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.4"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.4"
             legacy_db: 0
@@ -249,12 +213,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.5"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.5"
             legacy_db: 0
@@ -285,12 +243,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.6"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.6"
             legacy_db: 0
@@ -321,12 +273,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mariadb:10.11"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mariadb:10.11"
             legacy_db: 0
@@ -357,12 +303,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mysql:5.5"
-            legacy_db: 1
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mysql:5.5"
             legacy_db: 1
@@ -393,12 +333,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mysql:5.6"
-            legacy_db: 1
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mysql:5.6"
             legacy_db: 1
@@ -429,12 +363,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mysql:5.7"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mysql:5.7"
             legacy_db: 0
@@ -465,12 +393,6 @@ jobs:
             experimental: false
             py: "3.11"
 
-          - toxenv: "python2.7"
-            db: "mysql:8.0"
-            legacy_db: 0
-            experimental: false
-            py: "2.7"
-
           - toxenv: "python3.7"
             db: "mysql:8.0"
             legacy_db: 0

CONTRIBUTING.md

@@ -13,11 +13,7 @@ interactions related to the project.
 
 Ensuring backward compatibility is an imperative requirement.
 
-Currently, the tool supports Python versions 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10 and 3.11.
-
-Despite the fact that Python 2.7 has indeed reached the conclusion of its lifecycle in early 2020, a considerable number
-of individuals still rely heavily upon it. Consequently, it is incumbent upon us to maintain our support for this
-version until such time as the fundamental tools unequivocally discontinue their backing for it.
+Currently, the tool supports Python versions 3.7, 3.8, 3.9, 3.10 and 3.11.
 
 ## MySQL version support
 
@@ -36,18 +32,6 @@ In order to run the test suite run these commands using a Docker MySQL image.
 
 **Requires a running Docker instance!**
 
-- using Python 2.7
-```bash
-git clone https://github.com/techouse/sqlite3-to-mysql
-cd sqlite3-to-mysql
-virtualenv -p $(which python2) env
-source env/bin/activate
-pip install -e .
-pip install -r requirements_dev.txt
-tox
-```
-
-- using Python 3.5+
 ```bash
 git clone https://github.com/techouse/sqlite3-to-mysql
 cd sqlite3-to-mysql                   

MANIFEST.in

@@ -1,12 +1,13 @@
 [build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "sqlite3-to-mysql"
 description = "A simple Python tool to transfer data from SQLite 3 to MySQL"
+readme = "README.md"
 license = { text = "MIT" }
-requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+requires-python = ">=3.7"
 authors = [
     { name = "Klemen Tusar", email = "techouse@gmail.com" },
 ]
@@ -28,11 +29,7 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -42,43 +39,37 @@ classifiers = [
     "Topic :: Database",
 ]
 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,!=8.0.31 ; python_version>='3.6'",
-    "pytimeparse>=1.1.8; python_version<'3.6'",
-    "pytimeparse2; python_version>='3.6'",
-    "six>=1.12.0",
-    "simplejson>=3.16.0",
-    "tqdm>=4.35.0",
-    "packaging>=20.3",
-    "tabulate<0.8.6 ; python_version<'3.5'",
-    "tabulate ; python_version>='3.5'",
-    "Unidecode<=1.2.0 ; python_version<'3.5'",
-    "Unidecode>=1.2.0 ; python_version>='3.5'",
-    "backports-datetime-fromisoformat>=1.0.0 ; python_version>='3.4' and python_version<='3.6'",
+    "Click>=8.1.3",
+    "mysql-connector-python>=8.0.33",
+    "pytimeparse2",
+    "simplejson>=3.19.1",
+    "tqdm>=4.65.0",
+    "packaging>=23.1",
+    "tabulate",
+    "Unidecode>=1.3.6",
+    "typing_extensions",
 ]
-dynamic = ["version", "readme"]
+dynamic = ["version"]
 
-[tool.setuptools.dynamic]
-version = { attr = "sqlite3_to_mysql.__version__" }
-readme = { file = "README.md", content-type = "text/markdown" }
+[tool.hatch.version]
+path = "sqlite3_to_mysql/__init__.py"
 
-[tool.setuptools]
-packages = ["sqlite3_to_mysql"]
-include-package-data = true
-zip-safe = false
-license-files = ["LICENSE"]
-
-[tool.distutils.bdist_wheel]
-universal = true
+[tool.hatch.build.targets.sdist]
+include = [
+    "sqlite3_to_mysql",
+    "tests",
+    "README.md",
+    "CODE-OF-CONDUCT.md",
+    "LICENSE",
+    "requirements_dev.txt",
+]
 
 [project.scripts]
 sqlite3mysql = "sqlite3_to_mysql.cli:cli"
 
 [tool.black]
 line-length = 120
-target-version = ["py35", "py36", "py37", "py38", "py39", "py310", "py311"]
+target-version = ["py37", "py38", "py39", "py310", "py311"]
 include = '\.pyi?$'
 exclude = '''
 (
@@ -104,3 +95,31 @@ profile = "black"
 lines_after_imports = 2
 known_first_party = "sqlite3_to_mysql"
 skip_gitignore = true
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+norecursedirs = [".*", "venv", "env", "*.egg", "dist", "build"]
+minversion = "7.3.1"
+addopts = "-rsxX -l --tb=short --strict-markers"
+timeout = 300
+markers = [
+    "init: Run the initialisation test functions",
+    "transfer: Run the main transfer test functions",
+    "cli: Run the cli test functions",
+]
+
+[tool.mypy]
+python_version = "3.7"
+exclude = [
+    "tests",
+    "build",
+    "dist",
+    "venv",
+    "env",
+]
+warn_return_any = true
+warn_unused_configs = true
+
+[[tool.mypy.overrides]]
+module = "pytimeparse2.*,factory.*,docker.*"
+ignore_missing_imports = true

pyproject.toml

@@ -1,29 +1,28 @@
-Click>=7.0,<8.0.0 ; python_version<"3.6"
-Click>=7.0 ; python_version>="3.6"
-docker>=4.0.2
+Click>=8.1.3
+docker>=6.1.3
 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,!=8.0.31 ; python_version>="3.6"
-PyMySQL>=0.9.3
-pytest>=4.6.5
+Faker>=18.10.0
+mysql-connector-python>=8.0.33
+PyMySQL>=1.0.3
+pytest>=7.3.1
 pytest-cov
-pytest-faker ; python_version<"3.0"
 pytest-mock
 pytest-timeout
-pytimeparse>=1.1.8 ; python_version<"3.6"
-pytimeparse2 ; python_version>="3.6"
-simplejson>=3.16.0
-six>=1.12.0
-sqlalchemy>=1.3.7,<1.4.0 ; 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 ; python_version>="3.0"
+pytimeparse2
+simplejson>=3.19.1
+types-simplejson
+sqlalchemy>=2.0.0
+sqlalchemy-utils
+types-sqlalchemy-utils
 tox
-tqdm>=4.35.0
-packaging>=20.3
-tabulate<0.8.6 ; python_version<"3.5"
-tabulate ; python_version>="3.5"
-Unidecode<=1.2.0 ; python_version<"3.5"
-Unidecode>=1.2.0 ; python_version>="3.5"
-backports-datetime-fromisoformat>=1.0.0 ; python_version>="3.4" and python_version<="3.6"
+tqdm>=4.65.0
+types-tqdm
+packaging>=23.1
+tabulate
+types-tabulate
+Unidecode>=1.3.6
+typing_extensions
+types-Pygments
+types-colorama
+types-mock
+types-setuptools