From 0924e2aaf32bff7c2345b25707594378adbe6794 Mon Sep 17 00:00:00 2001
From: Tester <Tester@test.com>
Date: Wed, 27 Dec 2023 16:38:16 +0330
Subject: [PATCH] move `build.py`, `ffi` and `include` out of package

---
 Makefile                       |  6 +++---
 curl_cffi/build.py => build.py |  0
 {curl_cffi/ffi => ffi}/cdef.c  |  0
 {curl_cffi/ffi => ffi}/shim.c  |  0
 {curl_cffi/ffi => ffi}/shim.h  |  0
 pyproject.toml                 |  1 -
 setup.py                       | 20 ++------------------
 7 files changed, 5 insertions(+), 22 deletions(-)
 rename curl_cffi/build.py => build.py (100%)
 rename {curl_cffi/ffi => ffi}/cdef.c (100%)
 rename {curl_cffi/ffi => ffi}/shim.c (100%)
 rename {curl_cffi/ffi => ffi}/shim.h (100%)

diff --git a/Makefile b/Makefile
index de35bd0a..53d49369 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ curl_cffi/include/curl/curl.h: curl-impersonate-$(VERSION)/chrome/patches
 	for p in $</curl-*.patch; do patch -p1 < ../$$p; done
 	# Re-generate the configure script
 	autoreconf -fi
-	mkdir -p ../curl_cffi/include/curl
-	cp -R include/curl/* ../curl_cffi/include/curl/
+	mkdir -p ../include/curl
+	cp -R include/curl/* ../include/curl/
 
 .so_downloaded:
 	python preprocess/download_so.py
@@ -53,6 +53,6 @@ clean:
 	rm -rf build/ dist/ curl_cffi.egg-info/ $(CURL_VERSION)/ curl-impersonate-$(VERSION)/
 	rm -rf curl_cffi/*.o curl_cffi/*.so curl_cffi/_wrapper.c
 	rm -rf .preprocessed .so_downloaded $(CURL_VERSION).tar.xz curl-impersonate-$(VERSION).tar.gz
-	rm -rf curl_cffi/include/
+	rm -rf include/
 
 .PHONY: clean build test install-local upload preprocess
diff --git a/curl_cffi/build.py b/build.py
similarity index 100%
rename from curl_cffi/build.py
rename to build.py
diff --git a/curl_cffi/ffi/cdef.c b/ffi/cdef.c
similarity index 100%
rename from curl_cffi/ffi/cdef.c
rename to ffi/cdef.c
diff --git a/curl_cffi/ffi/shim.c b/ffi/shim.c
similarity index 100%
rename from curl_cffi/ffi/shim.c
rename to ffi/shim.c
diff --git a/curl_cffi/ffi/shim.h b/ffi/shim.h
similarity index 100%
rename from curl_cffi/ffi/shim.h
rename to ffi/shim.h
diff --git a/pyproject.toml b/pyproject.toml
index f38f59d9..ebe9d627 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,7 +69,6 @@ test = [
 [tool.setuptools]
 packages = ["curl_cffi", "curl_cffi.requests"]
 # package-data = { curl_cffi = ["libcurl/*/*"] }
-exclude-package-data = { curl_cffi = ["include/*", "ffi/*"] }
 
 
 [build-system]
diff --git a/setup.py b/setup.py
index 80de6827..31735d54 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,4 @@
-import fnmatch
-
 from setuptools import setup
-from setuptools.command.build_py import build_py
 from wheel.bdist_wheel import bdist_wheel
 
 
@@ -16,21 +13,8 @@ def get_tag(self):
         return python, abi, plat
 
 
-excluded = ['curl_cffi/build.py', 'curl_cffi\\build.py']
-
-
-class excluded_build_py(build_py):
-    def find_package_modules(self, package, package_dir):
-        modules = super().find_package_modules(package, package_dir)
-        return [
-            (pkg, mod, file)
-            for (pkg, mod, file) in modules
-            if not any(fnmatch.fnmatchcase(file, pat=pattern) for pattern in excluded)
-        ]
-
-
 setup(
     # this option is only valid in setup.py
-    cffi_modules=["curl_cffi/build.py:ffibuilder"],
-    cmdclass={"bdist_wheel": bdist_wheel_abi3, 'build_py': excluded_build_py},  # type: ignore
+    cffi_modules=["./build.py:ffibuilder"],
+    cmdclass={"bdist_wheel": bdist_wheel_abi3},  # type: ignore
 )