Removing the MacOS fixup

Author: lmbelo

delphifmx/__init__.py

@@ -1,4 +1,4 @@
-import sys, os, sys, platform, ctypes
+import sys, os, sys, platform
 from os import environ
 import importlib, importlib.machinery, importlib.util
 
@@ -13,7 +13,7 @@ def findmodule():
   libdir = None
   libext = None
 
-  if not (pyver in ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]):
+  if not (pyver in ["3.6", "3.7", "3.8", "3.9", "3.10"]):
     raise PyVerNotSupported(f"DelphiFMX doesn't support Python{pyver}.")
 
   if ossys == "Windows":
@@ -60,24 +60,8 @@ def findmodule():
   else:
     raise ValueError("Unsupported platform.")  
 
-def findfixup(dir, libext):
-  for fname in os.listdir(dir):
-    if ('libFixup' in fname) and (fname.endswith(libext)):
-      return os.path.join(dir, os.path.basename(fname))
-
 def new_import():  
     modulefullpath = findmodule()   
-
-    #Look for a fixup lib
-    base_path = os.path.basename(modulefullpath)
-    if base_path:
-      _, ext = os.path.splitext(modulefullpath)
-      #Try to find the fixup lib based on the module path
-      fixup_lib = findfixup(base_path, ext)
-      if fixup_lib:
-        #Loads the fixup lib
-        ctypes.cdll.LoadLibrary(fixup_lib)
-
     loader = importlib.machinery.ExtensionFileLoader("DelphiFMX", modulefullpath)
     spec = importlib.util.spec_from_file_location("DelphiFMX", modulefullpath,
         loader=loader, submodule_search_locations=None)

delphifmx/__version__.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"

lib/OSX64/libFixup.dylib

@@ -1,5 +1,7 @@
-import setuptools, os, sys, platform, distutils.dir_util
+import setuptools, os, sys, json, platform, shutil, distutils.dir_util
 from pathlib import Path
+from setuptools.command.install import install
+from setuptools.command.develop import develop
 
 pkgname = "delphifmx"
 
@@ -55,26 +57,15 @@ def get_release_version():
   else:
     raise ValueError("Unsupported platform.")
 
-#Copy the doc files to the package folder into the doc subfolder
-if os.path.exists(os.path.join("docs", "xml", "docs.xml")):
-  pkg_doc_dir = os.path.join(pkg_dir, "doc")
-  if not os.path.exists(pkg_doc_dir):
-    os.mkdir(pkg_doc_dir)
-  distutils.file_util.copy_file(os.path.join("docs", "xml", "docs.xml"), os.path.join(pkg_doc_dir, "docs.xml"))
-
 #Create the package data.   
 pkgdata = []
 for dir_, _, files in os.walk(pkg_dir):
   for file_name in files:
     rel_dir = os.path.relpath(dir_, pkg_dir)
-    rel_file = os.path.join(rel_dir, file_name)
-    #Add the shared library.
+    rel_file = os.path.join(rel_dir, file_name)    
     if ''.join(Path(rel_file).suffixes) in ['.pyd', '.tds', '.so', '.dylib', '.dylib.dSYM']:
       pkgdata.append(rel_file)
-    #Add the doc xml file
-    elif (rel_file.endswith('.xml')):
-      pkgdata.append(rel_file)
-
+print(pkgdata)
 #Read the current version from __version.py__
 versnewstr = get_release_version()   
 
@@ -92,7 +83,7 @@ def get_release_version():
   license="Other/Proprietary License",
   license_files=["LICENSE.md"],
   url = "https://github.com/Embarcadero/DelphiFMX4Python",
-  python_requires=">=3.3",
+  python_requires=">=3.3<=3.10",
   packages=[pkgname],
   package_data={pkgname: pkgdata},
   classifiers=[            
@@ -106,7 +97,6 @@ def get_release_version():
             'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: 3.9',
             'Programming Language :: Python :: 3.10',
-            'Programming Language :: Python :: 3.11',
             'Programming Language :: Python :: 3 :: Only',
             'Operating System :: Microsoft :: Windows',
             'Operating System :: POSIX',
@@ -117,4 +107,4 @@ def get_release_version():
   cmdclass={
     'bdist_wheel': bdist_wheel
   }
-)
+)