Use src-layout. (#600)

PyMySQL · May 15, 2023 · 0220f42 · 0220f42
1 parent abb139b
commit 0220f42
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -29,7 +29,7 @@ jobs:
           PIP_DISABLE_PIP_VERSION_CHECK: 1
         run: |
           pip install -r requirements.txt
-          python setup.py develop
+          pip install .
 
       - name: Run tests
         env:

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: build
 build:
-	python3 setup.py build_ext -if
+	python setup.py build_ext -if
 
 .PHONY: doc
 doc:
@@ -10,12 +10,12 @@ doc:
 
 .PHONY: clean
 clean:
-	python3 setup.py clean
+	python setup.py clean
 	find . -name '*.pyc' -delete
 	find . -name '__pycache__' -delete
 	rm -rf build
 
 .PHONY: check
 check:
 	ruff .
-	black *.py MySQLdb
+	black *.py src
diff --git a/codecov.yml b/codecov.yml
@@ -1,2 +1,2 @@
 ignore:
-  - "MySQLdb/constants/*"
+  - "src/MySQLdb/constants/*"
diff --git a/pyproject.toml b/pyproject.toml
@@ -39,10 +39,13 @@ Documentation = "https://mysqlclient.readthedocs.io/"
 requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools]
+package-dir = {"" = "src"}
+
 [tool.setuptools.packages.find]
 namespaces = false
+where = ["src"]
 include = ["MySQLdb*"]
-exclude = ["tests*", "pymysql.tests*"]
 
 [tool.setuptools.dynamic]
 version = {attr = "MySQLdb.release.__version__"}
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 
 release_info = {}
-with open("MySQLdb/release.py", encoding="utf-8") as f:
+with open("src/MySQLdb/release.py", encoding="utf-8") as f:
     exec(f.read(), None, release_info)
 
 
@@ -164,7 +164,7 @@ def get_options():
 ext_modules = [
     setuptools.Extension(
         "MySQLdb._mysql",
-        sources=["MySQLdb/_mysql.c"],
+        sources=["src/MySQLdb/_mysql.c"],
         **ext_options,
     )
 ]

diff --git a/MySQLdb/__init__.py → src/MySQLdb/__init__.py b/MySQLdb/__init__.py → src/MySQLdb/__init__.py
diff --git a/MySQLdb/_exceptions.py → src/MySQLdb/_exceptions.py b/MySQLdb/_exceptions.py → src/MySQLdb/_exceptions.py
diff --git a/MySQLdb/_mysql.c → src/MySQLdb/_mysql.c b/MySQLdb/_mysql.c → src/MySQLdb/_mysql.c
diff --git a/MySQLdb/connections.py → src/MySQLdb/connections.py b/MySQLdb/connections.py → src/MySQLdb/connections.py
diff --git a/MySQLdb/constants/CLIENT.py → src/MySQLdb/constants/CLIENT.py b/MySQLdb/constants/CLIENT.py → src/MySQLdb/constants/CLIENT.py
diff --git a/MySQLdb/constants/CR.py → src/MySQLdb/constants/CR.py b/MySQLdb/constants/CR.py → src/MySQLdb/constants/CR.py
diff --git a/MySQLdb/constants/ER.py → src/MySQLdb/constants/ER.py b/MySQLdb/constants/ER.py → src/MySQLdb/constants/ER.py
diff --git a/MySQLdb/constants/FIELD_TYPE.py → src/MySQLdb/constants/FIELD_TYPE.py b/MySQLdb/constants/FIELD_TYPE.py → src/MySQLdb/constants/FIELD_TYPE.py
diff --git a/MySQLdb/constants/FLAG.py → src/MySQLdb/constants/FLAG.py b/MySQLdb/constants/FLAG.py → src/MySQLdb/constants/FLAG.py
diff --git a/MySQLdb/constants/__init__.py → src/MySQLdb/constants/__init__.py b/MySQLdb/constants/__init__.py → src/MySQLdb/constants/__init__.py
diff --git a/MySQLdb/converters.py → src/MySQLdb/converters.py b/MySQLdb/converters.py → src/MySQLdb/converters.py
diff --git a/MySQLdb/cursors.py → src/MySQLdb/cursors.py b/MySQLdb/cursors.py → src/MySQLdb/cursors.py
diff --git a/MySQLdb/release.py → src/MySQLdb/release.py b/MySQLdb/release.py → src/MySQLdb/release.py
diff --git a/MySQLdb/times.py → src/MySQLdb/times.py b/MySQLdb/times.py → src/MySQLdb/times.py