bugfix

Author: PHILIPP111007

.gitignore

@@ -5,3 +5,4 @@ functions.so
 __pycache__
 matrix_table_consumer.egg-info
 build
+dist

README.md

@@ -3,7 +3,9 @@
 To install this package run (you need to have Go):
 
 ```bash
-python setup.py install
+pip install build
+python -m build
+pip install .
 ```
 
 To compile Go modules with C types to work with Python run:

__init__.py

@@ -0,0 +1 @@
+from .matrix_table_consumer import MatrixTableConsumer, NUM_CPU 

matrix_table_consumer/__init__.py

@@ -18,8 +18,10 @@
 Content: TypeAlias = dict
 Rows: TypeAlias = list[dict]
 
+current_dir = os.path.dirname(__file__)
+library_path = os.path.join(current_dir, "functions.so")
 
-lib = ctypes.CDLL("./functions.so")
+lib = ctypes.CDLL(library_path)
 CollectAll = lib.CollectAll
 Collect = lib.Collect
 Count = lib.Count

functions/functions.go renamed to matrix_table_consumer/functions/functions.go

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"

functions/go.mod renamed to matrix_table_consumer/functions/go.mod

@@ -14,7 +14,7 @@ class BuildGoExtension(build_ext):
     def run(self):
         super().run()
 
-        go_dir = os.path.join(os.getcwd(), "functions")
+        go_dir = os.path.join(os.getcwd(), "matrix_table_consumer", "functions")
         os.chdir(go_dir)
         env = os.environ.copy()
         env["CGO_ENABLED"] = "1"
@@ -27,7 +27,7 @@ def run(self):
         except subprocess.CalledProcessError as e:
             raise RuntimeError(f"Error building Go module: {e}")
         finally:
-            os.chdir("..")
+            os.chdir("../..")
 
 
 ext_modules = [
@@ -46,6 +46,7 @@ def run(self):
     packages=find_packages(),
     ext_modules=ext_modules,
     cmdclass={'build_ext': BuildGoExtension},
+    data_files=[("", ["matrix_table_consumer/functions.so"])],
     include_package_data=True,
     zip_safe=False,
     license='MIT',
@@ -58,5 +59,5 @@ def run(self):
         "Programming Language :: Python :: 3",
         "Operating System :: OS Independent",
     ],
-    python_requires="==3.12",
+    python_requires=">=3.12",
 )