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

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

@@ -1,7 +1,15 @@
 Metadata-Version: 2.4
 Name: zig-zon
-Version: 0.2.0
-Summary: 
+Version: 0.2.1
+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

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

@@ -37,7 +37,21 @@ pub fn build(b: *Build) void {
         .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 = &.{
+            .{ .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 = "Requires-Python", .value = ">=3.8" },
+            .{ .key = "Classifier", .value = "Development Status :: 4 - Beta" },
+        },
         .files = &.{
             .{ .src = b.path("build.zig.zon"), .dest = "build.zig.zon" },
             .{ .src = b.path("build.zig"), .dest = "build.zig" },

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

@@ -1,12 +1,12 @@
 .{
     .name = .python_zig_zon,
     .fingerprint = 0x3d332656a3644fc9,
-    .version = "0.2.0",
+    .version = "0.2.1",
     .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#d3b3de8f114f891e0d62c923441bb925eb8014ae",
+            .hash = "zig_python_sdist-0.0.1-wjgdOg-SAACQzg1tSdozTV7Tg11rIzVRDlx-8XIzOFee",
         },
     },
     .paths = .{

{zig-zon-0.2.0 → zig-zon-0.2.1}/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.1}/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":1,"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"],"requires":[]}}

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

@@ -49,7 +49,20 @@ 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 = &.{
+            .{ .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" },
+        },
         .files = &.{
             .{ .src = b.path("build.zig.zon"), .dest = "build.zig.zon" },
             .{ .src = b.path("build.zig"), .dest = "build.zig" },
@@ -124,11 +137,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.1}/zig-pkg/zig_python_sdist/src/build/SDistStep.zig

@@ -2,6 +2,7 @@ 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();
 
@@ -17,7 +18,11 @@ pub const Options = struct {
     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 +65,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.1/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