Wire up compyler to Makefile and GitHub Actions

Author: sideeffect42

.github/workflows/build-dist.yml

@@ -0,0 +1,48 @@
+---
+name: build-dist
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          submodules: true
+      - name: Information
+        run: |
+          python3 -V
+          python3 -W ignore -m pip --disable-pip-version-check list
+          bin/skonfig -V
+      - name: Build sdist
+        run: |
+          make sdist
+      - name: Upload sdist
+        uses: actions/upload-artifact@v7
+        with:
+          path: dist/*.tar*
+          archive: false
+      - name: Build zdist
+        run: |
+          make zdist
+      - name: Upload zdist
+        uses: actions/upload-artifact@v7
+        with:
+          path: dist/*.pyz
+          archive: false
+      - name: Build wheel
+        run: |
+          make wheel
+      - name: Upload wheel
+        uses: actions/upload-artifact@v7
+        with:
+          path: dist/*.whl
+          archive: false
+      - name: Clean
+        run: |
+          make clean

Makefile

@@ -1,5 +1,5 @@
 #
-# 2022,2025 Dennis Camera (dennis.camera at riiengineering.ch)
+# 2022,2025-2026 Dennis Camera (dennis.camera at riiengineering.ch)
 #
 # This file is part of skonfig.
 #
@@ -46,6 +46,7 @@ help: .FORCE
 	@echo ""
 	@echo "Releasing:"
 	@echo "  sdist           build a source code tar ball for distribution"
+	@echo "  wheel           build a Python wheel"
 	@echo "  zdist           build a single-file executable for distribution"
 	@echo ""
 	@echo "(*) if the environment variable SANDBOX is set, the tests will be"
@@ -235,18 +236,18 @@ install-user: build .FORCE
 # release commands
 #
 
-MAKE_PYZ_CMD = $(PYTHON) scripts/compyle.py --compression deflate --main scripts/pyzmain.py skonfig -o
-SKONFIG_VERSION_CMD = $$(python3 -c 'print(__import__("skonfig.version").version.__guess_git_version())')
-
 sdist: dist .FORCE
 	$(PYTHON) setup.py sdist --dist-dir=dist --formats=gztar --owner=$$(id -un 0) --group=$$(id -gn 0) --prune --metadata-check
 
+wheel: .FORCE
+	$(PYTHON) setup.py bdist_wheel --python-tag py3 --plat-name any
+
 # development
 skonfig.pyz: .FORCE
-	$(MAKE_PYZ_CMD) $@
+	$(PYTYHON) setup.py zdist --output $@
 
 zdist: dist .FORCE
-	$(MAKE_PYZ_CMD) "dist/skonfig-$(SKONFIG_VERSION_CMD).pyz"
+	$(PYTHON) setup.py zdist
 
 
 .FORCE:

scripts/compyle.py

@@ -26,9 +26,9 @@ def add_package_to_zip(package, zipf):
             zipf.writestr(os.path.join(pkg_name, module), f.read())
 
 
-def compile_package(packages, output_file, compression, main_module=None):
+def compile_package(packages, output_file, interpreter, compression, main_module=None):
     with open(output_file, "wb") as exe:
-        exe.write(b"#!/usr/bin/env python3\n")
+        exe.write(b"#!%s\n" % (interpreter.encode()))
 
         with zipfile.ZipFile(exe, "a", compression=compression) as zipf:
             for package in sorted(packages):
@@ -54,6 +54,10 @@ def compile_package(packages, output_file, compression, main_module=None):
         dest="compression",
         choices=list(zip_compressions.keys()),
         default="store")
+    parser.add_argument(
+        "--interpreter",
+        dest="interpreter",
+        default="/usr/bin/env python3")
     parser.add_argument(
         "--main",
         dest="main_script",
@@ -71,5 +75,6 @@ def compile_package(packages, output_file, compression, main_module=None):
     compile_package(
         args.packages,
         output_file=args.output_file,
+        interpreter=args.interpreter,
         main_module=args.main_script,
         compression=zip_compressions[args.compression])

setup.py

@@ -72,7 +72,7 @@ def _cmp(self, other):
         # setuptools 38.6.0 is required for connections to PyPI.
         # cf. also _pypi_can_connect()
         log.warn("You are running an old version of setuptools: %s. "
-                    "Consider upgrading." % (setuptools.__version__))
+                 "Consider upgrading." % (setuptools.__version__))
 except ImportError:
     from distutils.core import setup
     using_setuptools = False
@@ -223,6 +223,31 @@ def make_release_tree(self, base_dir, files):
         hardcode_version(version_file)
 
 
+class skonfig_zdist(distutils.cmd.Command):
+    user_options = [
+        ('executable=', 'e', "specify final destination interpreter path"),
+        ('output=', 'o', "output filename of .pyz file"),
+    ]
+
+    def initialize_options(self):
+        self.output = os.path.join("dist", self.distribution.get_fullname() + ".pyz")
+        self.executable = "/usr/bin/env python3"
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        import scripts.compyle
+        import zipfile
+
+        scripts.compyle.compile_package(
+            self.distribution.package_dir.keys(),
+            output_file=self.output,
+            interpreter=self.executable,
+            main_module="scripts/pyzmain.py",
+            compression=zipfile.ZIP_DEFLATED)
+
+
 class skonfig_clean(distutils.command.clean.clean):
     def run(self):
         ManPages.clean(self.distribution, dry_run=self.dry_run)
@@ -301,12 +326,11 @@ def _pypi_can_connect():
     data_files=data_files,
     cmdclass={
         "build": skonfig_build,
+        "build_manpages": skonfig_build_manpages,
         "build_py": skonfig_build_py,
         "sdist": skonfig_sdist,
+        "zdist": skonfig_zdist,
         "clean": skonfig_clean,
-
-        # custom commands
-        "build_manpages": skonfig_build_manpages,
     },
     classifiers=[
         "Development Status :: 6 - Mature",