From c49107586ec968bb670ca9cf9f75b38b746009f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20L=C3=B6ffler?= <michael@loeffler.io>
Date: Thu, 25 Apr 2024 13:30:55 +0300
Subject: [PATCH] Move project source back to src/geventhttpclient, making sure
 that the tests are run against the installed package

See discussion in https://github.com/geventhttpclient/geventhttpclient/issues/189
---
 MANIFEST.in                                              | 3 +--
 pyproject.toml                                           | 9 ++++-----
 {geventhttpclient => src/geventhttpclient}/__init__.py   | 0
 {geventhttpclient => src/geventhttpclient}/api.py        | 0
 {geventhttpclient => src/geventhttpclient}/client.py     | 0
 .../geventhttpclient}/connectionpool.py                  | 0
 {geventhttpclient => src/geventhttpclient}/header.py     | 0
 {geventhttpclient => src/geventhttpclient}/httplib.py    | 0
 {geventhttpclient => src/geventhttpclient}/httplib2.py   | 0
 {geventhttpclient => src/geventhttpclient}/requests.py   | 0
 {geventhttpclient => src/geventhttpclient}/response.py   | 0
 {geventhttpclient => src/geventhttpclient}/url.py        | 0
 {geventhttpclient => src/geventhttpclient}/useragent.py  | 0
 13 files changed, 5 insertions(+), 7 deletions(-)
 rename {geventhttpclient => src/geventhttpclient}/__init__.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/api.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/client.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/connectionpool.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/header.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/httplib.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/httplib2.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/requests.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/response.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/url.py (100%)
 rename {geventhttpclient => src/geventhttpclient}/useragent.py (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index ea08dc0b..b4c97131 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,7 @@
-include geventhttpclient/*.py
+include src/geventhttpclient/*.py
 include ext/*.c
 include ext/*.h
 recursive-include llhttp *.h *.c LICENSE-MIT
-recursive-exclude tests *
 global-exclude __pycache__
 global-exclude *.py[co]
 include pyproject.toml
diff --git a/pyproject.toml b/pyproject.toml
index 309c3e59..fc63dae1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,12 +55,11 @@ download = "https://pypi.org/project/geventhttpclient/#files"
 
 
 [tool.setuptools]
+package-dir = {"" = "src"}
 include-package-data = true
 
 [tool.setuptools.packages.find]
-where = [""]
-include = ["geventhttpclient"]
-exclude = ["*.tests", "*.tests.*", "tests.*", "tests"]
+where = ["src"]
 
 [tool.setuptools.package-data]
 "*" = ["README.md", "release.md", "LICENSE-MIT"]
@@ -94,8 +93,8 @@ commands =
     # find . -name '*.pyc' -delete
     python -m build
     pip install -r requirements-dev.txt
-    pip install -e.
-    pytest tests
+    pip install .
+    pytest
 """
 
 
diff --git a/geventhttpclient/__init__.py b/src/geventhttpclient/__init__.py
similarity index 100%
rename from geventhttpclient/__init__.py
rename to src/geventhttpclient/__init__.py
diff --git a/geventhttpclient/api.py b/src/geventhttpclient/api.py
similarity index 100%
rename from geventhttpclient/api.py
rename to src/geventhttpclient/api.py
diff --git a/geventhttpclient/client.py b/src/geventhttpclient/client.py
similarity index 100%
rename from geventhttpclient/client.py
rename to src/geventhttpclient/client.py
diff --git a/geventhttpclient/connectionpool.py b/src/geventhttpclient/connectionpool.py
similarity index 100%
rename from geventhttpclient/connectionpool.py
rename to src/geventhttpclient/connectionpool.py
diff --git a/geventhttpclient/header.py b/src/geventhttpclient/header.py
similarity index 100%
rename from geventhttpclient/header.py
rename to src/geventhttpclient/header.py
diff --git a/geventhttpclient/httplib.py b/src/geventhttpclient/httplib.py
similarity index 100%
rename from geventhttpclient/httplib.py
rename to src/geventhttpclient/httplib.py
diff --git a/geventhttpclient/httplib2.py b/src/geventhttpclient/httplib2.py
similarity index 100%
rename from geventhttpclient/httplib2.py
rename to src/geventhttpclient/httplib2.py
diff --git a/geventhttpclient/requests.py b/src/geventhttpclient/requests.py
similarity index 100%
rename from geventhttpclient/requests.py
rename to src/geventhttpclient/requests.py
diff --git a/geventhttpclient/response.py b/src/geventhttpclient/response.py
similarity index 100%
rename from geventhttpclient/response.py
rename to src/geventhttpclient/response.py
diff --git a/geventhttpclient/url.py b/src/geventhttpclient/url.py
similarity index 100%
rename from geventhttpclient/url.py
rename to src/geventhttpclient/url.py
diff --git a/geventhttpclient/useragent.py b/src/geventhttpclient/useragent.py
similarity index 100%
rename from geventhttpclient/useragent.py
rename to src/geventhttpclient/useragent.py