From 77ce369d284885b179c69a04201c8bfe1b3d0947 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Sun, 14 Jan 2024 11:11:00 +0800
Subject: [PATCH] bugfix

---
 setup.py | 123 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 62 insertions(+), 61 deletions(-)

diff --git a/setup.py b/setup.py
index 2f8966e..85d64c3 100755
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,11 @@
-# -*- coding: utf-8 -*-
-
-try:
-	from setuptools import setup
-except ImportError:
-	from distutils.core import setup
-# from Cython.Build import cythonize
-
+# -*- coding: utf-8 -*-
+
+try:
+	from setuptools import setup
+except ImportError:
+	from distutils.core import setup
+# from Cython.Build import cythonize
+
 with open('kivyblocks/version.py', 'r') as f:
 	x = f.read()
 	y = x[x.index("'")+1:]
@@ -14,58 +14,59 @@ with open('kivyblocks/version.py', 'r') as f:
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-
-description = "kivy blocks is a tool to build kivy ui with json format uidesc files"
-author = "yumoqing"
-email = "yumoqing@icloud.com"
-
-package_data = {
-	"kivyblocks":[
-		'imgs/*.png', 
-		'imgs/*.atlas', 
-		'imgs/*.gif',
-		'imgs/*.jpg',
-		'ttf/*.ttf', 
-		'ui/*.uidesc',
-		'xcamera/xcamera.kv',
-		# 'image_processing/cascades/haarcascade_frontalface_default.xml',
-		'xcamera/data/*'
-	],
-}
-
-setup(
-    name="kivyblocks",
-	# ext_modules= cythonize( [ ]),
-	ext_modules= [],
-    version=version,
-    # uncomment the following lines if you fill them out in release.py
-    description=description,
+
+description = "kivy blocks is a tool to build kivy ui with json format uidesc files"
+author = "yumoqing"
+email = "yumoqing@icloud.com"
+
+required = []
+with open('requirements.txt', 'r') as f:
+	ls = f.read()
+	required = ls.split('\n')
+
+package_data = {
+	"kivyblocks":[
+		'imgs/*.png', 
+		'imgs/*.atlas', 
+		'imgs/*.gif',
+		'imgs/*.jpg',
+		'ttf/*.ttf', 
+		'ui/*.uidesc',
+		'xcamera/xcamera.kv',
+		# 'image_processing/cascades/haarcascade_frontalface_default.xml',
+		'xcamera/data/*'
+	],
+}
+
+setup(
+    name="kivyblocks",
+	# ext_modules= cythonize( [ ]),
+	ext_modules= [],
+    version=version,
+    # uncomment the following lines if you fill them out in release.py
+    description=description,
 	long_description=long_description,
 	long_description_content_type="text/markdown",
-    author=author,
-    author_email=email,
-   
-    install_requires=[
-	"kivy",
-	"appPublic",
-	"sqlor"
-    ],
-    packages=[
-		'kivyblocks',
-		# 'kivyblocks.image_processing',
-		'kivyblocks.mapview',
-		'kivyblocks.uitype',
-		'kivyblocks.widgetExt'
-		# 'kivyblocks.xcamera'
-	],
-    package_data=package_data,
-    keywords = [
-    ],
-    classifiers = [
-        'Development Status :: 3 - Alpha',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.5',
-        'Topic :: Software Development :: Libraries :: Python Modules'
-    ],
-	platforms= 'any'
-)
+    author=author,
+    author_email=email,
+   
+    install_requires=required,
+    packages=[
+		'kivyblocks',
+		# 'kivyblocks.image_processing',
+		'kivyblocks.mapview',
+		'kivyblocks.uitype',
+		'kivyblocks.widgetExt'
+		# 'kivyblocks.xcamera'
+	],
+    package_data=package_data,
+    keywords = [
+    ],
+    classifiers = [
+        'Development Status :: 3 - Alpha',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 3.5',
+        'Topic :: Software Development :: Libraries :: Python Modules'
+    ],
+	platforms= 'any'
+)