zig-zon 0.2.0__tar.gz → 0.2.2__tar.gz

{zig-zon-0.2.0 → zig-zon-0.2.2}/PKG-INFO

@@ -1,7 +1,15 @@
 Metadata-Version: 2.4
 Name: zig-zon
-Version: 0.2.0
-Summary: 
+Version: 0.2.2
+Summary: a native cpython extension to parse zig object notation strings
+Author-email: Tobias Simetsreiter <dasimmet@gmail.com>
+Maintainer-email: Tobias Simetsreiter <dasimmet@gmail.com>
+License-Expression: MIT
+Keywords: zig,ziglang,cpython,native,sdist,zon
+Requires-Python: >=3.8
+Project-URL: Homepage, https://codeberg.org/dasimmet/python-zig-zon
+Project-URL: Issues, https://codeberg.org/dasimmet/python-zig-zon/issues
+Classifier: Development Status :: 4 - Beta
 Description-Content-Type: text/markdown
 
 # Python Zig Zon Parser
@@ -33,6 +41,23 @@ print(parsed)
 
 or, look at the [test file](https://codeberg.org/dasimmet/python-zig-zon/src/branch/main/src/test_zig_zon.py)
 
+## Supported values and their python type
+
+- `structs` -> `dict`
+- `tuples` -> `list`
+- `integer literals` -> `int`
+- `hex literals` -> `int`
+- `float literals` -> `float`
+- `booleans` -> `bool`
+- `null` -> `None`
+- `string literals` -> `str`
+- `bare enum literals` -> `str`
+- `quoted enum literals` -> `str`
+
+## Not supported values
+
+- `bigint`
+
 ## How it works
 
 The `zig build` commands produces a python source distribution archive ready

{zig-zon-0.2.0 → zig-zon-0.2.2}/build.zig

@@ -10,35 +10,18 @@ pub fn build(b: *Build) void {
 
     // this target and section of our build is used at pip install time
     const ext_install_step = b.step("pyext", "build python extension module");
-    {
-        const cpython = zig_python_sdist.CPython.find(b);
-
-        const lib = b.addLibrary(.{
-            .name = "zig_zon",
-            .root_module = b.addModule("zig_zon", .{
-                .root_source_file = b.path("src/zig_zon.zig"),
-                .target = target,
-                .optimize = optimize,
-            }),
-            .linkage = .dynamic,
-        });
-        cpython.link(b, .{
-            .lib = lib,
-            .version = zon.version,
-            .optimize = .ReleaseSmall,
-        });
-        const ext_install = zig_python_sdist.CPython.installExtLib(b, lib);
-
-        ext_install_step.dependOn(&ext_install.step);
-    }
 
     // this generates a python sdist archive
     const sdist = zig_python_sdist.create(b, .{
         .name = "zig-zon",
         .version = zon.version,
         .description = b.path("README.md"),
-        .build_args = &.{ ext_install_step.name, b.fmt("-Doptimize={s}", .{@tagName(optimize)}) },
+        .build = .{
+            .args = &.{ ext_install_step.name, b.fmt("-Doptimize={s}", .{@tagName(optimize)}) },
+        },
+        .extra_pkg_info = @import("pkg-info.zon"),
         .files = &.{
+            .{ .src = b.path("pkg-info.zon"), .dest = "pkg-info.zon" },
             .{ .src = b.path("build.zig.zon"), .dest = "build.zig.zon" },
             .{ .src = b.path("build.zig"), .dest = "build.zig" },
             .{ .src = b.path("src/zig_zon.zig"), .dest = "src/zig_zon.zig" },
@@ -59,8 +42,31 @@ pub fn build(b: *Build) void {
         .{
             .sdist = sdist.getEmittedArchive(),
             .test_py = b.path("src/test_zig_zon.py"),
+            .twine_check = true,
             .no_clean = b.option(bool, "pip-no-clean", "dont cleanup pip temp dirs") orelse false,
         },
     );
     b.step("test-pip-install", "").dependOn(test_pip_install.step);
+
+    {
+        const cpython = zig_python_sdist.CPython.find(b);
+
+        const lib = b.addLibrary(.{
+            .name = "zig_zon",
+            .root_module = b.addModule("zig_zon", .{
+                .root_source_file = b.path("src/zig_zon.zig"),
+                .target = target,
+                .optimize = optimize,
+            }),
+            .linkage = .dynamic,
+        });
+        cpython.link(b, .{
+            .lib = lib,
+            .version = zon.version,
+            .optimize = .ReleaseSmall,
+        });
+        const ext_install = zig_python_sdist.CPython.installExtLib(b, lib);
+
+        ext_install_step.dependOn(&ext_install.step);
+    }
 }

{zig-zon-0.2.0 → zig-zon-0.2.2}/build.zig.zon

@@ -1,18 +1,19 @@
 .{
     .name = .python_zig_zon,
     .fingerprint = 0x3d332656a3644fc9,
-    .version = "0.2.0",
+    .version = "0.2.2",
     .minimum_zig_version = "0.16.0",
     .dependencies = .{
         .zig_python_sdist = .{
-            .url = "git+https://codeberg.org/dasimmet/zig-python-sdist.git#509be1fcce025754c7bc6f0647802e79e195778b",
-            .hash = "zig_python_sdist-0.0.1-wjgdOo-NAAAH7qc0ulwksgbdgfrZ8bP4EhMw_ZRN1UtS",
+            .url = "git+https://codeberg.org/dasimmet/zig-python-sdist.git#d5bd94633cf5923342108c824f61b377a2a8c492",
+            .hash = "zig_python_sdist-0.0.1-wjgdOsiNAAC2GtJiAx3dGIloYzgt1_sojmm62pPPalAS",
         },
     },
     .paths = .{
         "src",
         "build.zig",
         "build.zig.zon",
+        "pkg-info.zon",
         "LICENSE",
         "README.md",
         "setup.py",

zig-zon-0.2.2/pkg-info.zon

@@ -0,0 +1,11 @@
+.{
+    .{ .key = "Summary", .value = "a native cpython extension to parse zig object notation strings" },
+    .{ .key = "Author-email", .value = "Tobias Simetsreiter <dasimmet@gmail.com>" },
+    .{ .key = "Maintainer-email", .value = "Tobias Simetsreiter <dasimmet@gmail.com>" },
+    .{ .key = "License-Expression", .value = "MIT" },
+    .{ .key = "Keywords", .value = "zig,ziglang,cpython,native,sdist,zon" },
+    .{ .key = "Requires-Python", .value = ">=3.8" },
+    .{ .key = "Project-URL", .value = "Homepage, https://codeberg.org/dasimmet/python-zig-zon" },
+    .{ .key = "Project-URL", .value = "Issues, https://codeberg.org/dasimmet/python-zig-zon/issues" },
+    .{ .key = "Classifier", .value = "Development Status :: 4 - Beta" },
+}

{zig-zon-0.2.0 → zig-zon-0.2.2}/setup.py

@@ -59,5 +59,5 @@ setup(
         "setuptools",
         "wheel",
         "ziglang==" + mkversion(setup_json['zig_version'], need_release=True),
-    ],
+    ] + setup_json['build']['requires'],
 )

{zig-zon-0.2.0 → zig-zon-0.2.2}/setup.zig.json

@@ -1 +1 @@
-{"name":"zig_zon","version":{"major":0,"minor":2,"patch":0,"pre":null,"build":null},"zig_version":{"major":0,"minor":16,"patch":0,"pre":null,"build":null},"build":{"args":["pyext","-Doptimize=Debug","--fork=zig-pkg/zig_python_sdist"]}}
+{"name":"zig_zon","version":{"major":0,"minor":2,"patch":2,"pre":null,"build":null},"zig_version":{"major":0,"minor":16,"patch":0,"pre":null,"build":null},"build":{"args":["pyext","-Doptimize=ReleaseSafe","--fork=zig-pkg/zig_python_sdist"],"requires":[]}}

{zig-zon-0.2.0 → zig-zon-0.2.2}/src/zig_zon.zig

@@ -66,7 +66,7 @@ pub fn parse(self: [*]PyObject, args: [*]PyObject) callconv(.c) [*c]PyObject {
 
     const main_node_index = ast.nodeData(.root).node;
 
-    return parseZon(arena, ast, main_node_index) catch |err| {
+    return parseZonAst(arena, ast, main_node_index) catch |err| {
         const errstr = std.fmt.allocPrintSentinel(
             arena,
             "zig-zon parse error: {s}",
@@ -86,10 +86,11 @@ const ZonError = error{
     StructExpected,
     StructIdentifierExpected,
     NotImplemented,
-    ZonArrayError,
+    ZonArrayInitFailed,
+    InvalidLiteral, // from quoted enum literal parse function
 } || IdentifierError || NumberLiteralError;
 
-fn parseZon(arena: Allocator, tree: Ast, node: Ast.Node.Index) ZonError!*c.PyObject {
+fn parseZonAst(arena: Allocator, tree: Ast, node: Ast.Node.Index) ZonError!*c.PyObject {
     const node_tag = tree.nodeTag(node);
     switch (node_tag) {
         .struct_init_comma,
@@ -114,8 +115,13 @@ fn parseZon(arena: Allocator, tree: Ast, node: Ast.Node.Index) ZonError!*c.PyObj
             const name_token = tree.firstToken(node);
             const enum_name = tree.tokenSlice(name_token + 1);
             if (std.mem.startsWith(u8, enum_name, "@")) {
-                std.log.err("non bare enum literals not implemented: {s}", .{enum_name});
-                return error.NotImplemented;
+                std.debug.assert(std.mem.startsWith(u8, enum_name, "@\""));
+                std.debug.assert(std.mem.endsWith(u8, enum_name, "\""));
+                const enum_parsed_name = try std.zig.string_literal.parseAlloc(
+                    arena,
+                    enum_name[1..enum_name.len],
+                );
+                return c.Py_BuildValue("s#", enum_parsed_name.ptr, enum_parsed_name.len);
             }
 
             return c.Py_BuildValue("s#", enum_name.ptr, enum_name.len);
@@ -208,7 +214,7 @@ fn parseZonStruct(arena: Allocator, tree: Ast, node: Ast.Node.Index) ZonError!*c
     for (struct_init.ast.fields) |field_init| {
         const name_token = tree.firstToken(field_init) - 2;
         const field_name = try identifierTokenString(arena, tree, name_token);
-        const field_obj = try parseZon(arena, tree, field_init);
+        const field_obj = try parseZonAst(arena, tree, field_init);
         const set_result = c.PyDict_SetItemString(ret, field_name, field_obj);
         assert(set_result >= 0);
     }
@@ -221,13 +227,13 @@ fn parseZonArray(arena: Allocator, tree: Ast, node: Ast.Node.Index) !*c.PyObject
     const array_init = tree.fullArrayInit(&buf, node) orelse {
         const tok = tree.nodeMainToken(node);
         std.log.err("expected paths expression to be a list of strings, got: {d}", .{tok});
-        return error.ZonArrayError;
+        return error.ZonArrayInitFailed;
     };
 
     const ret = c.PyList_New(0);
 
     for (array_init.ast.elements) |elem_node| {
-        const field_ret = try parseZon(arena, tree, elem_node);
+        const field_ret = try parseZonAst(arena, tree, elem_node);
         assert(c.PyList_Append(ret, field_ret) >= 0);
     }
     return ret;

{zig-zon-0.2.0 → zig-zon-0.2.2}/zig-pkg/zig_python_sdist/build.zig

@@ -49,10 +49,14 @@ pub fn build(b: *Build) void {
         .name = "zig-python-sdist-dummy",
         .version = zon.version,
         .description = b.path("README.md"),
-        .build_args = &.{build_ext_step.name}, // target name for pip zig build command
+        .build = .{
+            .args = &.{build_ext_step.name},
+        },
+        .extra_pkg_info = @import("pkg-info.zon"),
         .files = &.{
             .{ .src = b.path("build.zig.zon"), .dest = "build.zig.zon" },
             .{ .src = b.path("build.zig"), .dest = "build.zig" },
+            .{ .src = b.path("pkg-info.zon"), .dest = "pkg-info.zon" },
             .{ .src = b.path("example/sdist_dummy.zig"), .dest = "example/sdist_dummy.zig" },
         },
         .directories = &.{
@@ -74,6 +78,7 @@ pub fn build(b: *Build) void {
         .{
             .sdist = sdist.getEmittedArchive(),
             .test_py = b.path("example/test_ext.py"),
+            .twine_check = true,
             .no_clean = b.option(bool, "pip-no-clean", "cleanup pip temp dirs") orelse false,
         },
     );
@@ -93,6 +98,7 @@ pub fn create(b: *Build, options: SDistStep.Options) *SDistStep {
         const extra_files: []const SDistStep.Content = &.{
             .{ .src = sdist.path("build.zig.zon"), .dest = "zig-pkg/zig_python_sdist/build.zig.zon" },
             .{ .src = sdist.path("build.zig"), .dest = "zig-pkg/zig_python_sdist/build.zig" },
+            .{ .src = sdist.path("pkg-info.zon"), .dest = "zig-pkg/zig_python_sdist/pkg-info.zon" },
             .{ .src = sdist.path("README.md"), .dest = "zig-pkg/zig_python_sdist/README.md" },
             .{ .src = sdist.path("LICENSE"), .dest = "zig-pkg/zig_python_sdist/LICENSE" },
         };
@@ -108,7 +114,6 @@ pub fn create(b: *Build, options: SDistStep.Options) *SDistStep {
     {
         var dirs: std.ArrayList(SDistStep.Content) = .empty;
         const extra_dirs: []const SDistStep.Content = &.{
-            // .{ .src = sdist.path("src"), .dest = "zig-pkg/zig_python_sdist/src" },
             .{ .src = sdist.path("src/build"), .dest = "zig-pkg/zig_python_sdist/src/build" },
         };
         dirs.ensureTotalCapacity(
@@ -124,11 +129,11 @@ pub fn create(b: *Build, options: SDistStep.Options) *SDistStep {
         var args: std.ArrayList([]const u8) = .empty;
         args.ensureTotalCapacity(
             b.allocator,
-            opt.build_args.len + 1,
+            opt.build.args.len + 1,
         ) catch @panic("OOM");
-        args.appendSliceAssumeCapacity(opt.build_args);
+        args.appendSliceAssumeCapacity(opt.build.args);
         args.appendAssumeCapacity("--fork=zig-pkg/zig_python_sdist");
-        opt.build_args = args.toOwnedSlice(b.allocator) catch @panic("OOM");
+        opt.build.args = args.toOwnedSlice(b.allocator) catch @panic("OOM");
     }
 
     return SDistStep.createInternal(b, opt);

{zig-zon-0.2.0 → zig-zon-0.2.2}/zig-pkg/zig_python_sdist/build.zig.zon

@@ -5,6 +5,7 @@
     .paths = .{
         "build.zig",
         "build.zig.zon",
+        "pkg-info.zon",
         "README.md",
         "LICENSE",
         "src",

zig-zon-0.2.2/zig-pkg/zig_python_sdist/pkg-info.zon

@@ -0,0 +1,11 @@
+.{
+    .{ .key = "Summary", .value = "Just a Test" },
+    .{ .key = "Author-email", .value = "Tobias Simetsreiter <dasimmet@gmail.com>" },
+    .{ .key = "Maintainer-email", .value = "Tobias Simetsreiter <dasimmet@gmail.com>" },
+    .{ .key = "License-Expression", .value = "MIT" },
+    .{ .key = "Keywords", .value = "zig,ziglang,cpython,native,sdist" },
+    .{ .key = "Requires-Python", .value = ">=3.8" },
+    .{ .key = "Project-URL", .value = "Homepage, https://codeberg.org/dasimmet/zig-python-sdist" },
+    .{ .key = "Project-URL", .value = "Issues, https://codeberg.org/dasimmet/zig-python-sdist/issues" },
+    .{ .key = "Classifier", .value = "Development Status :: 4 - Beta" },
+}

{zig-zon-0.2.0 → zig-zon-0.2.2}/zig-pkg/zig_python_sdist/src/build/CPython.zig

@@ -77,7 +77,7 @@ pub fn link(self: CPython, b: *Build, options: LinkOptions) void {
     const python_inc = self.generateIncludeDir(b);
 
     const cpython = b.addTranslateC(.{
-        .root_source_file = python_inc.path(b, "Zig_Python_With_Hexver.h"),
+        .root_source_file = python_inc.path(b, "zig_python_include.h"),
         .optimize = options.optimize orelse options.lib.root_module.optimize orelse .ReleaseSafe,
         .target = target,
     });
@@ -124,71 +124,6 @@ pub fn lib_ext_name(b: *Build, lib: *Build.Step.Compile) []const u8 {
         b.fmt("{s}.so", .{lib.name});
 }
 
-pub fn run_test(
-    self: CPython,
-    b: *Build,
-    lib: *Build.Step.Compile,
-    test_py_file: Build.LazyPath,
-) *Build.Step.Run {
-    const wf = b.addWriteFiles();
-    const python_runner = wf.add("python-runner.zig", @embedFile("python-runner.zig"));
-
-    const runner = b.addExecutable(.{
-        .name = "python-runner",
-        .root_module = b.createModule(.{
-            .root_source_file = python_runner,
-            .target = b.graph.host,
-            .optimize = .ReleaseSmall,
-        }),
-    });
-    const run_step = b.addRunArtifact(runner);
-    const python_ext = writeExtensionFile(b, lib);
-    run_step.addFileArg(self.exe);
-    run_step.addDirectoryArg(python_ext.dirname());
-    run_step.addFileArg(test_py_file);
-    run_step.has_side_effects = true;
-    return run_step;
-}
-
-pub fn writeExtensionFile(b: *Build, lib: *Build.Step.Compile) Build.LazyPath {
-    const ext_lib_name = lib_ext_name(b, lib);
-    const wf = b.addWriteFiles();
-    return wf.addCopyFile(lib.getEmittedBin(), ext_lib_name);
-}
-
-pub fn addSdistList(b: *Build) void {
-    const wf = b.addWriteFiles();
-    var wr: std.Io.Writer.Allocating = .init(b.allocator);
-    var jw: std.json.Stringify = .{ .writer = &wr.writer };
-    jw.beginObject() catch @panic("OOM");
-    if (b.graph.global_cache_root.path) |global_cache| {
-        jw.objectField("global_cache_dir") catch @panic("OOM");
-        jw.write(global_cache) catch @panic("OOM");
-    }
-
-    jw.objectField("dependencies") catch @panic("OOM");
-    jw.beginArray() catch @panic("OOM");
-    writeDeps(b, &jw) catch @panic("OOM");
-    jw.endArray() catch @panic("OOM");
-    jw.endObject() catch @panic("OOM");
-
-    const out = wf.add("sdistlist.json", wr.written());
-    const sdist_step = b.step("sdistlist", "generate a list of files for python sdist");
-    sdist_step.dependOn(&b.addInstallFile(out, "sdistlist.json").step);
-}
-
-fn writeDeps(b: *std.Build, w: *std.json.Stringify) !void {
-    for (b.available_deps) |dep| {
-        try w.beginArray();
-        try w.write(dep[0]);
-        try w.write(dep[1]);
-        try w.endArray();
-        if (b.lazyDependency(dep[0], .{})) |lazy_dep| {
-            try writeDeps(lazy_dep.builder, w);
-        }
-    }
-}
-
 // compat for 0.16.0 and 0.17.0
 pub fn findProgramCompat(b: *std.Build, names: []const []const u8) ?[]const u8 {
     if (comptime (@import("builtin").zig_version.order(std.SemanticVersion.parse("0.16.0") catch unreachable) == .gt)) {

{zig-zon-0.2.0 → zig-zon-0.2.2}/zig-pkg/zig_python_sdist/src/build/SDistStep.zig

@@ -2,22 +2,29 @@ const std = @import("std");
 const Build = std.Build;
 const LazyPath = Build.LazyPath;
 const LowerDashStringFormatter = @import("LowerDashStringFormatter.zig");
+const PkgInfo = @import("pkg_info.zig");
 
 const SDistStep = @This();
 
 basename: []const u8,
 builder: *Build.Step.Compile,
 archive: LazyPath,
+
 pub const Content = struct {
     src: LazyPath,
     dest: []const u8,
 };
+
 pub const Options = struct {
     name: []const u8,
     version: []const u8,
     description: ?LazyPath = null,
     files: []const Content = &.{},
-    build_args: []const []const u8 = &.{},
+    build: struct {
+        args: []const []const u8 = &.{},
+        requires: []const []const u8 = &.{},
+    } = .{},
+    extra_pkg_info: []const PkgInfo.Header = &.{},
     directories: []const Content = &.{},
     sdist_builder: ?*Build.Step.Compile = null,
     // the version of the ziglang python package to depend on.
@@ -60,9 +67,18 @@ pub fn createInternal(b: *Build, options: Options) *SDistStep {
         run.addPrefixedDirectoryArg("--dir=", content.src);
         run.addArg(content.dest);
     }
-    for (options.build_args) |ba| {
+    for (options.build.args) |ba| {
         run.addArg(b.fmt("--build={s}", .{ba}));
     }
+    for (options.build.requires) |br| {
+        run.addArg(b.fmt("--build-requires={s}", .{br}));
+    }
+    if (options.extra_pkg_info.len > 0) {
+        const extra_info = std.fmt.allocPrint(b.allocator, "--extra-pkg-info={f}", .{
+            std.json.fmt(options.extra_pkg_info, .{ .whitespace = .minified }),
+        }) catch @panic("OOM");
+        run.addArg(extra_info);
+    }
 
     self.* = .{
         .basename = basename,

{zig-zon-0.2.0 → zig-zon-0.2.2}/zig-pkg/zig_python_sdist/src/build/VenvInstallTest.zig

@@ -16,6 +16,7 @@ pub const Options = struct {
     no_clean: bool,
     // pass in python interpreter. uses system python if null
     python: ?LazyPath = null,
+    twine_check: bool = false,
 };
 
 pub fn create(b: *Build, options: Options) *VenvInstallTest {
@@ -44,19 +45,43 @@ pub fn create(b: *Build, options: Options) *VenvInstallTest {
 
     const deps_run = std.Build.Step.Run.create(b, "venv");
     deps_run.addFileArg(venv_python);
-    deps_run.addArgs(&.{
-        "-m",
-        "pip",
-        "install",
-        "-U",
-        "pip",
-        "wheel",
-    });
+    deps_run.step.dependOn(&wf.step);
+
+    if (options.twine_check) {
+        deps_run.addArgs(&.{
+            "-m",
+            "pip",
+            "install",
+            "-U",
+            "pip",
+            "wheel",
+            "twine",
+        });
+    } else {
+        deps_run.addArgs(&.{
+            "-m",
+            "pip",
+            "install",
+            "-U",
+            "pip",
+            "wheel",
+        });
+    }
+
     deps_run.step.dependOn(&venv_run.step);
 
-    self.install_run = std.Build.Step.Run.create(b, "venv");
+    self.install_run = std.Build.Step.Run.create(b, "pip install");
     self.step = &self.install_run.step;
 
+    if (options.twine_check) {
+        const twine_check = std.Build.Step.Run.create(b, "twine check");
+        twine_check.step.dependOn(&deps_run.step);
+        twine_check.addFileArg(venv_python);
+        twine_check.addArgs(&.{ "-m", "twine", "check", "--strict" });
+        twine_check.addFileArg(options.sdist);
+        self.step.dependOn(&twine_check.step);
+    }
+
     self.install_run.addFileArg(venv_python);
     self.install_run.addArgs(&.{ "-m", "pip", "install", "--force-reinstall", "--verbose" });
     if (options.no_clean) self.install_run.addArg("--no-clean");

zig-zon-0.2.2/zig-pkg/zig_python_sdist/src/build/extract_link_info.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+
+import sysconfig
+import sys
+import shutil
+import os
+
+
+def main():
+    output_dir = sys.argv[1]
+    syspath = sysconfig.get_paths()
+
+    python_h = os.path.join(output_dir, 'Python.h')
+    output_header = os.path.join(output_dir, 'zig_python_include.h')
+
+    os.makedirs(output_dir, exist_ok=True)
+    shutil.copytree(syspath['include'], output_dir, dirs_exist_ok=True)
+
+    sources = [syspath['include']]
+
+    if sys.platform in ['windows', 'win32', 'cygwin']:
+        find_lib(output_dir, sources)
+
+    if not os.path.isfile(python_h):
+        raise Exception("Python.h missing! syspath include: {}\n output: {}".format(
+            syspath['include'], output_dir))
+
+    output_h_str = '''
+// zig_python_include.h generated by extract_link_info.py
+// sources: {}
+#ifndef PY_SSIZE_T_CLEAN
+#define PY_SSIZE_T_CLEAN
+#endif
+
+#ifndef PYHEXVER
+#define PYHEXVER {}
+#endif
+
+#include "Python.h"
+'''.format(sources, sys.hexversion)
+
+    with open(output_header, 'w') as fd:
+        fd.write(output_h_str)
+
+
+def find_lib(output_dir, sources=[]):
+    lib_filename = 'python{}{}.lib'.format(
+        sys.version_info.major, sys.version_info.minor)
+    found_lib = False
+    for k, v in sysconfig.get_config_vars().items():
+        if not isinstance(v, str):
+            continue
+        vf = os.path.join(v, lib_filename)
+        if os.path.exists(vf):
+            try:
+                shutil.copyfile(vf, os.path.join(output_dir, 'python.lib'))
+                found_lib = True
+                sources.append(vf)
+                break
+            except:
+                pass
+        else:
+            pass
+
+        vfl = os.path.join(v, 'libs', lib_filename)
+        if os.path.exists(vfl):
+            try:
+                shutil.copyfile(vfl, os.path.join(
+                    output_dir, 'python.lib'))
+                found_lib = True
+                sources.append(vfl)
+                break
+            except:
+                pass
+        else:
+            pass
+
+    if not found_lib:
+        raise Exception(
+            " ".join(["Warning: Did not find", str(lib_filename)]))
+
+
+if __name__ == '__main__':
+    main()

zig-zon-0.2.2/zig-pkg/zig_python_sdist/src/build/pkg_info.zig

@@ -0,0 +1,51 @@
+/// Representation of pythons sdist's PKG_INFO file
+///
+const std = @import("std");
+const PkgInfo = @This();
+pub const empty: PkgInfo = .{
+    .headers = .empty,
+    .description = .empty,
+};
+
+headers: std.ArrayList(Header),
+description: std.ArrayList(u8),
+
+pub const Header = struct {
+    key: []const u8,
+    value: []const u8,
+};
+
+pub fn format(self: @This(), w: *std.Io.Writer) !void {
+    for (self.headers.items) |h| {
+        if (std.mem.containsAtLeast(u8, h.key, 1, "\n")) {
+            std.log.err("newlines are not allowed in pkg-info header keys: {s}", .{h.key});
+            return error.WriteFailed;
+        }
+        if (std.mem.containsAtLeast(u8, h.value, 1, "\n")) {
+            std.log.err("newlines are not allowed in pkg-info headers values: {s}", .{h.value});
+            return error.WriteFailed;
+        }
+        try w.print("{s}: {s}\n", .{ h.key, h.value });
+    }
+    try w.writeAll("\n");
+    try w.writeAll(self.description.items);
+}
+
+// Metadata-Version: 2.4
+// Name: zig-zon
+// Version: 0.1.3
+// Summary: a native cpython extension to parse zig object notation strings
+// Author-email: Tobias Simetsreiter <dasimmet@gmail.com>
+// Maintainer-email: Tobias Simetsreiter <dasimmet@gmail.com>
+// License-Expression: MIT
+// Project-URL: Homepage, https://codeberg.org/dasimmet/python-zig-zon
+// Project-URL: Issues, https://codeberg.org/dasimmet/python-zig-zon/issues
+// Keywords: zig,ziglang,zon,cpython
+// Classifier: Development Status :: 4 - Beta
+// Classifier: Intended Audience :: Developers
+// Classifier: Programming Language :: Python :: 3
+// Classifier: Programming Language :: Python :: 3.9
+// Requires-Python: >=3.9
+// Description-Content-Type: text/markdown
+// License-File: LICENSE
+// Dynamic: license-file

zig-zon-0.2.0/zig-pkg/zig_python_sdist/src/build/extract_link_info.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-
-import sysconfig
-import sys
-import shutil
-import os
-
-output_dir = sys.argv[1]
-syspath = sysconfig.get_paths()
-
-lib_filename = 'python{}{}.lib'.format(
-    sys.version_info.major, sys.version_info.minor)
-
-os.makedirs(output_dir, exist_ok=True)
-shutil.copytree(syspath['include'], output_dir, dirs_exist_ok=True)
-
-found_lib = False
-sources = [syspath['include']]
-
-for k, v in sysconfig.get_config_vars().items():
-    if not isinstance(v, str):
-        continue
-    vf = os.path.join(v, lib_filename)
-    if os.path.exists(vf):
-        try:
-            shutil.copyfile(vf, os.path.join(output_dir, 'python.lib'))
-            found_lib = True
-            sources.append(vf)
-            break
-        except:
-            pass
-    else:
-        pass
-
-    vfl = os.path.join(v, 'libs', lib_filename)
-    if os.path.exists(vfl):
-        try:
-            shutil.copyfile(vfl, os.path.join(output_dir, 'python.lib'))
-            found_lib = True
-            sources.append(vfl)
-            break
-        except:
-            pass
-    else:
-        pass
-
-if sys.platform == 'windows' and not found_lib:
-    print("Warning: Did not find", lib_filename, "in:", file=sys.stderr)
-    print(lib_paths, file=sys.stderr)
-
-python_h = os.path.join(output_dir, 'Python.h')
-if not os.path.isfile(python_h):
-    raise Exception("Python.h missing! syspath include: {}\n output: {}".format(
-        syspath['include'], output_dir))
-
-output_header = os.path.join(output_dir, 'Zig_Python_With_Hexver.h')
-
-with open(output_header, 'w') as fd:
-    fd.write('''
-// Zig_Python_With_Hexver.h generated by extract_link_info.py
-// sources: {}
-#ifndef PY_SSIZE_T_CLEAN
-#define PY_SSIZE_T_CLEAN
-#endif
-
-#ifndef PYHEXVER
-#define PYHEXVER {}
-#endif
-
-#include "Python.h"
-'''.format(sources, sys.hexversion))
-    print('OK:', output_header)