🚚 move package to src directory (#72)

techouse · Apr 13, 2024 · c217ed0 · c217ed0
1 parent a4e56e5
commit c217ed0
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,10 +24,10 @@ jobs:
         id: compare
         run: |
           set -e
-          VERSION=$(awk -F'"' '/__version__/ {print $2}' mysql_to_sqlite3/__init__.py)
+          VERSION=$(awk -F'"' '/__version__/ {print $2}' src/mysql_to_sqlite3/__init__.py)
           TAG=${GITHUB_REF_NAME#v}
           if [[ "$VERSION" != "$TAG" ]]; then
-            echo "Version in mysql-to-sqlite3/__version__.py ($VERSION) does not match tag ($TAG)"
+            echo "Version in src/mysql_to_sqlite3/__version__.py ($VERSION) does not match tag ($TAG)"
             exit 1
           fi
           echo "VERSION=$VERSION" >> $GITHUB_ENV

diff --git a/pyproject.toml b/pyproject.toml
@@ -56,11 +56,11 @@ Sponsor = "https://github.com/sponsors/techouse"
 PayPal = "https://paypal.me/ktusar"
 
 [tool.hatch.version]
-path = "mysql_to_sqlite3/__init__.py"
+path = "src/mysql_to_sqlite3/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [
-    "mysql_to_sqlite3",
+    "src",
     "tests",
     "README.md",
     "CHANGELOG.md",
@@ -102,6 +102,7 @@ known_first_party = "mysql_to_sqlite3"
 skip_gitignore = true
 
 [tool.pytest.ini_options]
+pythonpath = ["src"]
 testpaths = ["tests"]
 norecursedirs = [".*", "venv", "env", "*.egg", "dist", "build"]
 minversion = "7.3.1"
@@ -115,6 +116,7 @@ markers = [
 ]
 
 [tool.mypy]
+mypy_path = "src"
 python_version = "3.8"
 exclude = [
     "tests",

diff --git a/mysql_to_sqlite3/__init__.py → src/mysql_to_sqlite3/__init__.py b/mysql_to_sqlite3/__init__.py → src/mysql_to_sqlite3/__init__.py
diff --git a/mysql_to_sqlite3/cli.py → src/mysql_to_sqlite3/cli.py b/mysql_to_sqlite3/cli.py → src/mysql_to_sqlite3/cli.py
diff --git a/mysql_to_sqlite3/click_utils.py → src/mysql_to_sqlite3/click_utils.py b/mysql_to_sqlite3/click_utils.py → src/mysql_to_sqlite3/click_utils.py
diff --git a/mysql_to_sqlite3/debug_info.py → src/mysql_to_sqlite3/debug_info.py b/mysql_to_sqlite3/debug_info.py → src/mysql_to_sqlite3/debug_info.py
diff --git a/mysql_to_sqlite3/mysql_utils.py → src/mysql_to_sqlite3/mysql_utils.py b/mysql_to_sqlite3/mysql_utils.py → src/mysql_to_sqlite3/mysql_utils.py
diff --git a/mysql_to_sqlite3/py.typed → src/mysql_to_sqlite3/py.typed b/mysql_to_sqlite3/py.typed → src/mysql_to_sqlite3/py.typed
diff --git a/mysql_to_sqlite3/sqlite_utils.py → src/mysql_to_sqlite3/sqlite_utils.py b/mysql_to_sqlite3/sqlite_utils.py → src/mysql_to_sqlite3/sqlite_utils.py
diff --git a/mysql_to_sqlite3/transporter.py → src/mysql_to_sqlite3/transporter.py b/mysql_to_sqlite3/transporter.py → src/mysql_to_sqlite3/transporter.py
diff --git a/mysql_to_sqlite3/types.py → src/mysql_to_sqlite3/types.py b/mysql_to_sqlite3/types.py → src/mysql_to_sqlite3/types.py
diff --git a/tox.ini b/tox.ini
@@ -25,14 +25,14 @@ passenv =
     LEGACY_DB
 deps =
     -rrequirements_dev.txt
-commands = pytest -v --cov=mysql_to_sqlite3 --cov-report=xml
+commands = pytest -v --cov=src/mysql_to_sqlite3 --cov-report=xml
 
 [testenv:black]
 basepython = python3
 skip_install = true
 deps =
     black
-commands = black mysql_to_sqlite3 tests/
+commands = black src/mysql_to_sqlite3 tests/
 
 [testenv:isort]
 basepython = python3
@@ -53,7 +53,7 @@ deps =
     flake8-typing-imports
     pep8-naming
 commands =
-    flake8 mysql_to_sqlite3
+    flake8 src/mysql_to_sqlite3
 
 [testenv:pylint]
 basepython = python3
@@ -63,15 +63,15 @@ deps =
     -rrequirements_dev.txt
 disable = C0209,C0301,C0411,R,W0107,W0622
 commands =
-    pylint --rcfile=tox.ini mysql_to_sqlite3
+    pylint --rcfile=tox.ini src/mysql_to_sqlite3
 
 [testenv:bandit]
 basepython = python3
 skip_install = true
 deps =
     bandit
 commands =
-    bandit -r mysql_to_sqlite3 -c .bandit.yml
+    bandit -r src/mysql_to_sqlite3 -c .bandit.yml
 
 [testenv:mypy]
 basepython = python3
@@ -80,7 +80,7 @@ deps =
     mypy>=1.3.0
     -rrequirements_dev.txt
 commands =
-    mypy mysql_to_sqlite3
+    mypy src/mysql_to_sqlite3
 
 [testenv:linters]
 basepython = python3