setuptools-zig-build 0.1.2__tar.gz → 0.2.0__tar.gz

{setuptools_zig_build-0.1.2 → setuptools_zig_build-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: setuptools_zig_build
-Version: 0.1.2
+Version: 0.2.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
@@ -31,7 +31,37 @@ Dynamic: summary
 # Setuptools zig build
 
 A setuptools extension, for building cpython extensions with zig build,
-enabling source-only pip distributions that compile at install time.
+enabling simple source-only pip distributions that compile at install time.
+
+check out [zig-zon](https://gitlab.com/dasimmet/python-zig-zon) for an example
+
+## Example `setup.py`
+
+```python
+from setuptools import Extension
+from setuptools import setup
+
+setup(
+    name='zig-zon',
+    packages=[],
+    zig_build={
+        # stores zig's depdendencies in python's sdist. requires a call to
+        # CPython.addSdistList(b); in `build.zig`
+        "sdist": True,
+        # tries to import 'ziglang' to get a zig compiler when building wheel
+        "use_ziglang_python_package": True,
+        # passes -Doptimize= to zig build
+        "optimize": "ReleaseSmall",
+        # passes -Dversion=<pip package version> to zig build
+        "pass_version_option": True,
+        # extra arguments to zig build
+        'extra_args': [
+            "install", "test",
+        ],
+    },
+    ext_modules=[Extension('zig_zon', [])],
+)
+```
 
 ## References
 

setuptools_zig_build-0.2.0/README.md

@@ -0,0 +1,38 @@
+# Setuptools zig build
+
+A setuptools extension, for building cpython extensions with zig build,
+enabling simple source-only pip distributions that compile at install time.
+
+check out [zig-zon](https://gitlab.com/dasimmet/python-zig-zon) for an example
+
+## Example `setup.py`
+
+```python
+from setuptools import Extension
+from setuptools import setup
+
+setup(
+    name='zig-zon',
+    packages=[],
+    zig_build={
+        # stores zig's depdendencies in python's sdist. requires a call to
+        # CPython.addSdistList(b); in `build.zig`
+        "sdist": True,
+        # tries to import 'ziglang' to get a zig compiler when building wheel
+        "use_ziglang_python_package": True,
+        # passes -Doptimize= to zig build
+        "optimize": "ReleaseSmall",
+        # passes -Dversion=<pip package version> to zig build
+        "pass_version_option": True,
+        # extra arguments to zig build
+        'extra_args': [
+            "install", "test",
+        ],
+    },
+    ext_modules=[Extension('zig_zon', [])],
+)
+```
+
+## References
+
+@ruamel and [setuptools-zig](https://sourceforge.net/p/setuptools-zig)

{setuptools_zig_build-0.1.2 → setuptools_zig_build-0.2.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='setuptools_zig_build',
-    version="0.1.2",
+    version="0.2.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.1.2 → setuptools_zig_build-0.2.0}/setuptools_zig_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: setuptools_zig_build
-Version: 0.1.2
+Version: 0.2.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
@@ -31,7 +31,37 @@ Dynamic: summary
 # Setuptools zig build
 
 A setuptools extension, for building cpython extensions with zig build,
-enabling source-only pip distributions that compile at install time.
+enabling simple source-only pip distributions that compile at install time.
+
+check out [zig-zon](https://gitlab.com/dasimmet/python-zig-zon) for an example
+
+## Example `setup.py`
+
+```python
+from setuptools import Extension
+from setuptools import setup
+
+setup(
+    name='zig-zon',
+    packages=[],
+    zig_build={
+        # stores zig's depdendencies in python's sdist. requires a call to
+        # CPython.addSdistList(b); in `build.zig`
+        "sdist": True,
+        # tries to import 'ziglang' to get a zig compiler when building wheel
+        "use_ziglang_python_package": True,
+        # passes -Doptimize= to zig build
+        "optimize": "ReleaseSmall",
+        # passes -Dversion=<pip package version> to zig build
+        "pass_version_option": True,
+        # extra arguments to zig build
+        'extra_args': [
+            "install", "test",
+        ],
+    },
+    ext_modules=[Extension('zig_zon', [])],
+)
+```
 
 ## References
 

{setuptools_zig_build-0.1.2 → setuptools_zig_build-0.2.0}/setuptools_zig_build.py

@@ -9,6 +9,7 @@ import shlex
 from setuptools import Extension
 from distutils.dist import Distribution
 from setuptools.command.build_ext import build_ext as SetupToolsBuildExt
+from setuptools.command.sdist import sdist as SetupToolsSdist
 
 
 class ZigCompilerError(Exception):
@@ -28,14 +29,11 @@ class ZigBuild:
                  use_ziglang_python_package: bool = False,
                  optimize: str = "ReleaseSafe",
                  pass_version_option: bool = False,
-                 test_step: str = None,
                  extra_args: list = [],
+                 sdist: bool = False,
                  ):
         assert isinstance(use_ziglang_python_package, bool)
         self.use_ziglang_python_package = use_ziglang_python_package
-        assert test_step == None or (isinstance(
-            test_step, str) and not test_step.startswith('-'))
-        self.test_step = test_step
         assert optimize == None or (isinstance(
             optimize, str) and optimize in self.OPTIMIZE)
         self.optimize = optimize
@@ -45,6 +43,8 @@ class ZigBuild:
         for arg in extra_args:
             assert isinstance(arg, str)
         self.extra_args = extra_args
+        assert isinstance(sdist, bool)
+        self.sdist = sdist
 
 
 class BuildExt(SetupToolsBuildExt):
@@ -82,12 +82,9 @@ class BuildExt(SetupToolsBuildExt):
             zig_exe = os.path.join(
                 os.path.dirname(ziglang.__file__), "zig")
 
-        bld_cmd = [zig_exe, 'build', 'install',
+        bld_cmd = [zig_exe, 'build',
                    '-Dpython={}'.format(sys.executable), '--prefix', str(zig_out.absolute())]
 
-        if self._zig_value.test_step != None:
-            bld_cmd.append(self._zig_value.test_step)
-
         if self._zig_value.optimize != None:
             bld_cmd.append(
                 '-Doptimize={}'.format(self._zig_value.optimize))
@@ -98,6 +95,15 @@ class BuildExt(SetupToolsBuildExt):
 
         bld_cmd.extend(self._zig_value.extra_args)
 
+        if self._zig_value.sdist:
+            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)
+
         os.makedirs(self.build_temp, exist_ok=True)
         print('\ncmd', shlex.join(bld_cmd))
         sys.stdout.flush()
@@ -124,6 +130,56 @@ class BuildExt(SetupToolsBuildExt):
         output.rename(target)
 
 
+class Sdist(SetupToolsSdist):
+    def make_release_tree(self, base_dir, files) -> None:
+        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
+            zig_exe = os.path.join(
+                os.path.dirname(ziglang.__file__), "zig")
+        except:
+            pass
+
+        cmd = [zig_exe, "build", "sdistlist", '--prefix', base_dir]
+        print("cmd:", cmd)
+        run(cmd, check=True)
+        import shutil
+
+        with open(sdistlist_name) as fd:
+            sdistlist = json.load(fd)
+
+        for deps in sdistlist['dependencies']:
+            src = os.path.join(sdistlist['global_cache_dir'], 'p', deps[1])
+            dst = os.path.join(base_dir, '.zig-dependencies', deps[1])
+            if not os.path.isdir(src):
+                print("dep not found:", deps[0], src)
+                continue
+            print("packaging zig dep:", deps[0], src)
+            for root, _, walk_files in os.walk(src):
+                if '.zig-cache' in root:
+                    continue
+                rel_dir = os.path.relpath(root, src)
+                os.makedirs(os.path.join(dst, rel_dir), exist_ok=True)
+                for f in walk_files:
+                    source_file = os.path.join(root, f)
+                    rel_file = os.path.normpath(
+                        os.path.join(rel_dir, f))
+                    dest_file = os.path.normpath(
+                        os.path.join(dst, rel_dir, f))
+                    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
@@ -136,5 +192,8 @@ def setup_zig_build(dist, keyword, value):
     '''our hook into setuptools '''
     assert isinstance(dist, Distribution)
     assert keyword == 'zig_build'
-    be = dist.cmdclass.get('build_ext')
+    dist.cmdclass.get('build_ext')
     dist.cmdclass['build_ext'] = ZigBuildExtension(value)
+    if 'sdist' in value and value['sdist'] == True:
+        dist.cmdclass.get('sdist')
+        dist.cmdclass['sdist'] = Sdist

setuptools_zig_build-0.1.2/README.md

@@ -1,8 +0,0 @@
-# Setuptools zig build
-
-A setuptools extension, for building cpython extensions with zig build,
-enabling source-only pip distributions that compile at install time.
-
-## References
-
-@ruamel and [setuptools-zig](https://sourceforge.net/p/setuptools-zig)