setuptools-zig-build 0.2.2__tar.gz → 0.3.0__tar.gz

{setuptools_zig_build-0.2.2/setuptools_zig_build.egg-info → setuptools_zig_build-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: setuptools_zig_build
-Version: 0.2.2
+Version: 0.3.0
 Summary: A setuptools extension, for building cpython extensions with zig build
 Home-page: https://codeberg.org/dasimmet/setuptools-zig-build
 Author-email: dasimmet@gmail.com
@@ -54,7 +54,7 @@ setup(
         # stores zig's depdendency pacakges in python's sdist. This requires a call to
         # CPython.addSdistList(b); in `build.zig`
         # If set to False, potential dependencies will be downloaded by zig instead.
-        "sdist": True,
+        "sdist_args": ["sdistlist"],
         # tries to import 'ziglang' to get a zig compiler when building wheel
         "use_ziglang_python_package": True,
         # passes -Doptimize= to zig build
@@ -62,7 +62,7 @@ setup(
         # passes -Dversion=<pip package version> to zig build
         "pass_version_option": True,
         # extra arguments to zig build. In this case we pass the `install` and `test` steps
-        'extra_args': [
+        'build_args': [
             "install", "test",
         ],
     },

{setuptools_zig_build-0.2.2 → setuptools_zig_build-0.3.0}/README.md

@@ -24,7 +24,7 @@ setup(
         # stores zig's depdendency pacakges in python's sdist. This requires a call to
         # CPython.addSdistList(b); in `build.zig`
         # If set to False, potential dependencies will be downloaded by zig instead.
-        "sdist": True,
+        "sdist_args": ["sdistlist"],
         # tries to import 'ziglang' to get a zig compiler when building wheel
         "use_ziglang_python_package": True,
         # passes -Doptimize= to zig build
@@ -32,7 +32,7 @@ setup(
         # passes -Dversion=<pip package version> to zig build
         "pass_version_option": True,
         # extra arguments to zig build. In this case we pass the `install` and `test` steps
-        'extra_args': [
+        'build_args': [
             "install", "test",
         ],
     },

{setuptools_zig_build-0.2.2 → setuptools_zig_build-0.3.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='setuptools_zig_build',
-    version="0.2.2",
+    version="0.3.0",
     author_email='dasimmet@gmail.com',
     description='A setuptools extension, for building cpython extensions with zig build',
     long_description=open("README.md").read(),

{setuptools_zig_build-0.2.2 → setuptools_zig_build-0.3.0/setuptools_zig_build.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: setuptools_zig_build
-Version: 0.2.2
+Version: 0.3.0
 Summary: A setuptools extension, for building cpython extensions with zig build
 Home-page: https://codeberg.org/dasimmet/setuptools-zig-build
 Author-email: dasimmet@gmail.com
@@ -54,7 +54,7 @@ setup(
         # stores zig's depdendency pacakges in python's sdist. This requires a call to
         # CPython.addSdistList(b); in `build.zig`
         # If set to False, potential dependencies will be downloaded by zig instead.
-        "sdist": True,
+        "sdist_args": ["sdistlist"],
         # tries to import 'ziglang' to get a zig compiler when building wheel
         "use_ziglang_python_package": True,
         # passes -Doptimize= to zig build
@@ -62,7 +62,7 @@ setup(
         # passes -Dversion=<pip package version> to zig build
         "pass_version_option": True,
         # extra arguments to zig build. In this case we pass the `install` and `test` steps
-        'extra_args': [
+        'build_args': [
             "install", "test",
         ],
     },

{setuptools_zig_build-0.2.2 → setuptools_zig_build-0.3.0}/setuptools_zig_build.py

@@ -2,7 +2,6 @@
 
 import sys
 import os
-from subprocess import run
 from pathlib import Path
 import shlex
 
@@ -29,22 +28,30 @@ class ZigBuild:
                  use_ziglang_python_package: bool = False,
                  optimize: str = "ReleaseSafe",
                  pass_version_option: bool = False,
-                 extra_args: list = [],
-                 sdist: bool = False,
+                 sdist_args: list = None,
+                 build_args: list = [],
                  ):
+
         assert isinstance(use_ziglang_python_package, bool)
         self.use_ziglang_python_package = use_ziglang_python_package
+
         assert optimize == None or (isinstance(
             optimize, str) and optimize in self.OPTIMIZE)
         self.optimize = optimize
+
         assert isinstance(pass_version_option, bool)
         self.pass_version_option = pass_version_option
-        assert isinstance(extra_args, list)
-        for arg in extra_args:
+
+        if sdist_args != None:
+            assert isinstance(sdist_args, list)
+            for arg in sdist_args:
+                assert isinstance(arg, str)
+        self.sdist_args = sdist_args
+
+        assert isinstance(build_args, list)
+        for arg in build_args:
             assert isinstance(arg, str)
-        self.extra_args = extra_args
-        assert isinstance(sdist, bool)
-        self.sdist = sdist
+        self.build_args = build_args
 
 
 class BuildExt(SetupToolsBuildExt):
@@ -55,7 +62,6 @@ class BuildExt(SetupToolsBuildExt):
             self._zig_value = zig_value
         else:
             raise ZigCompilerError('unknown type:', zig_value)
-
         super().__init__(dist)
 
     def build_extension(self, ext):
@@ -93,21 +99,21 @@ class BuildExt(SetupToolsBuildExt):
             bld_cmd.append(
                 '-Dversion={}'.format(self.distribution.get_version()))
 
-        bld_cmd.extend(self._zig_value.extra_args)
+        bld_cmd.extend(self._zig_value.build_args)
 
-        if self._zig_value.sdist:
+        if self._zig_value.sdist_args != None:
             if os.path.isdir(".zig-dependencies"):
                 for it in os.listdir(".zig-dependencies"):
                     dep_dir = os.path.join(".zig-dependencies", it)
                     if os.path.isdir(".zig-dependencies"):
                         fetch_cmd = [zig_exe, "fetch", dep_dir]
                         print("cmd: {}".format(shlex.join(fetch_cmd)))
-                        run(fetch_cmd, check=True)
+                        self.spawn(fetch_cmd)
 
         os.makedirs(self.build_temp, exist_ok=True)
         print('\ncmd', shlex.join(bld_cmd))
         sys.stdout.flush()
-        run(bld_cmd, check=True, cwd=build_zig_dir)
+        self.spawn(bld_cmd)
 
         output = None
         for subpath in ['', 'lib', 'bin/', 'lib/', 'bin/lib', 'lib/lib']:
@@ -131,14 +137,29 @@ class BuildExt(SetupToolsBuildExt):
 
 
 class Sdist(SetupToolsSdist):
+    def __init__(self, dist, zig_value):
+        if isinstance(zig_value, dict):
+            self._zig_value = ZigBuild(**zig_value)
+        elif isinstance(zig_value, ZigBuild):
+            self._zig_value = zig_value
+        else:
+            raise ZigCompilerError('unknown type:', zig_value)
+        super().__init__(dist)
+
     def make_release_tree(self, base_dir, files) -> None:
+        if self._zig_value.sdist_args != None:
+            self.make_zig_sdist(base_dir, files)
+        super().make_release_tree(base_dir, files)
+        if self._zig_value.sdist_args != None:
+            files.extend(self.zig_dep_sources)
+
+    def make_zig_sdist(self, base_dir, files):
         import os
         import json
         self.zig_dep_sources = []
 
         sdistlist_name = os.path.join(base_dir, 'sdistlist.json')
 
-        from subprocess import run
         zig_exe = "zig"
         try:
             import ziglang
@@ -147,9 +168,11 @@ class Sdist(SetupToolsSdist):
         except:
             pass
 
-        cmd = [zig_exe, "build", "sdistlist", '--prefix', base_dir]
-        print("cmd:", cmd)
-        run(cmd, check=True)
+        cmd = [zig_exe, "build", '--prefix', base_dir]
+        cmd.extend(self._zig_value.sdist_args)
+
+        print("cmd:", shlex.join(cmd))
+        self.spawn(cmd)
         import shutil
 
         with open(sdistlist_name) as fd:
@@ -176,24 +199,21 @@ class Sdist(SetupToolsSdist):
                     shutil.copyfile(source_file, dest_file)
                     self.zig_dep_sources.append(rel_file)
 
-        super().make_release_tree(base_dir, files)
-        files.extend(self.zig_dep_sources)
-
-
-class ZigBuildExtension:
-    def __init__(self, value):
-        self._value = value
 
-    def __call__(self, dist):
-        return BuildExt(dist, zig_value=self._value)
+def class_wrapper(base_cls, cls, value):
+    class ZigBuildClassWrapper(base_cls):
+        def __new__(base_cls, dist):
+            return cls(dist, zig_value=value)
+    return ZigBuildClassWrapper
 
 
 def setup_zig_build(dist, keyword, value):
     '''our hook into setuptools '''
     assert isinstance(dist, Distribution)
     assert keyword == 'zig_build'
+    v = ZigBuild(**value)
     dist.cmdclass.get('build_ext')
-    dist.cmdclass['build_ext'] = ZigBuildExtension(value)
+    dist.cmdclass['build_ext'] = class_wrapper(SetupToolsBuildExt, BuildExt, v)
     if 'sdist' in value and value['sdist'] == True:
         dist.cmdclass.get('sdist')
-        dist.cmdclass['sdist'] = Sdist
+        dist.cmdclass['sdist'] = class_wrapper(SetupToolsSdist, Sdist, v)