Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dyff for openSUSE:Factory checked in at 2026-03-18 16:50:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dyff (Old) and /work/SRC/openSUSE:Factory/.dyff.new.8177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dyff" Wed Mar 18 16:50:38 2026 rev:19 rq:1340836 version:1.11.3 Changes: -------- --- /work/SRC/openSUSE:Factory/dyff/dyff.changes 2026-03-02 17:39:51.942201330 +0100 +++ /work/SRC/openSUSE:Factory/.dyff.new.8177/dyff.changes 2026-03-18 16:52:24.337775429 +0100 @@ -1,0 +2,15 @@ +Wed Mar 18 06:51:13 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 1.11.3: + * Add test case for empty document not being read correctly + * Switch to `github.com/mitchellh/hashstructure/v2` + * build(deps): bump golang.org/x/tools from 0.42.0 to 0.43.0 + * build(deps): bump golang.org/x/net from 0.51.0 to 0.52.0 + * build(deps): bump golang.org/x/term from 0.40.0 to 0.41.0 + * build(deps): bump golang.org/x/mod from 0.33.0 to 0.34.0 + * build(deps): bump golang.org/x/text from 0.34.0 to 0.35.0 + * build(deps): bump golang.org/x/sync from 0.19.0 to 0.20.0 + * build(deps): bump go.yaml.in/yaml/v2 from 2.4.3 to 2.4.4 + * build(deps): bump golang.org/x/sys from 0.41.0 to 0.42.0 + +------------------------------------------------------------------- Old: ---- dyff-1.11.2.obscpio New: ---- dyff-1.11.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dyff.spec ++++++ --- /var/tmp/diff_new_pack.74B92y/_old 2026-03-18 16:52:25.029803952 +0100 +++ /var/tmp/diff_new_pack.74B92y/_new 2026-03-18 16:52:25.029803952 +0100 @@ -17,7 +17,7 @@ Name: dyff -Version: 1.11.2 +Version: 1.11.3 Release: 0 Summary: Diff tool for YAML files, and sometimes JSON License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.74B92y/_old 2026-03-18 16:52:25.113807414 +0100 +++ /var/tmp/diff_new_pack.74B92y/_new 2026-03-18 16:52:25.113807414 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/homeport/dyff</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.11.2</param> + <param name="revision">v1.11.3</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.74B92y/_old 2026-03-18 16:52:25.169809723 +0100 +++ /var/tmp/diff_new_pack.74B92y/_new 2026-03-18 16:52:25.177810052 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/homeport/dyff</param> - <param name="changesrevision">6c36ce0d21d83f307a4e76ee810d9657947e3cf9</param></service></servicedata> + <param name="changesrevision">4512053136bcd17cc8784b386f6c75bda7e01ec2</param></service></servicedata> (No newline at EOF) ++++++ dyff-1.11.2.obscpio -> dyff-1.11.3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dyff-1.11.2/assets/edge/empty/to.yml new/dyff-1.11.3/assets/edge/empty/to.yml --- old/dyff-1.11.2/assets/edge/empty/to.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dyff-1.11.3/assets/edge/empty/to.yml 2026-03-17 14:28:35.000000000 +0100 @@ -0,0 +1,12 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: foo + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: bar + namespace: foo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dyff-1.11.2/go.mod new/dyff-1.11.3/go.mod --- old/dyff-1.11.2/go.mod 2026-03-01 17:08:27.000000000 +0100 +++ new/dyff-1.11.3/go.mod 2026-03-17 14:28:35.000000000 +0100 @@ -9,9 +9,9 @@ github.com/gonvenience/neat v1.3.18 github.com/gonvenience/term v1.0.5 github.com/gonvenience/text v1.0.10 - github.com/gonvenience/ytbx v1.4.8 + github.com/gonvenience/ytbx v1.4.9 github.com/lucasb-eyer/go-colorful v1.3.0 - github.com/mitchellh/hashstructure v1.1.0 + github.com/mitchellh/hashstructure/v2 v2.0.2 github.com/onsi/ginkgo/v2 v2.28.1 github.com/onsi/gomega v1.39.1 github.com/sergi/go-diff v1.4.0 @@ -37,12 +37,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect - go.yaml.in/yaml/v2 v2.4.3 // indirect - golang.org/x/mod v0.33.0 // indirect - golang.org/x/net v0.51.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.41.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect - golang.org/x/tools v0.42.0 // indirect + go.yaml.in/yaml/v2 v2.4.4 // indirect + golang.org/x/mod v0.34.0 // indirect + golang.org/x/net v0.52.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.42.0 // indirect + golang.org/x/term v0.41.0 // indirect + golang.org/x/text v0.35.0 // indirect + golang.org/x/tools v0.43.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dyff-1.11.2/go.sum new/dyff-1.11.3/go.sum --- old/dyff-1.11.2/go.sum 2026-03-01 17:08:27.000000000 +0100 +++ new/dyff-1.11.3/go.sum 2026-03-17 14:28:35.000000000 +0100 @@ -27,8 +27,6 @@ github.com/gonvenience/bunt v1.4.3/go.mod h1:ggA6odP6FNOh50mGxxytSSJTs2Ghy5Veq9wIVSbuoAw= github.com/gonvenience/idem v0.0.3 h1:rZ2f17JU5GHa3b5M5R2fClz0dYN3EFGhHHGo3AZz/1U= github.com/gonvenience/idem v0.0.3/go.mod h1:ChZ+RP8e30+uCBcCIzN/0di6lTO2PucjemgKfzQUQEw= -github.com/gonvenience/neat v1.3.17 h1:S/F0XNE4sc/b3APfLDqC9xM476Or55WhXZ7F/Sy07QY= -github.com/gonvenience/neat v1.3.17/go.mod h1:h+b8M0LFDZUKS5D4xaoPd2qTLrVpX+bDRlDJphOAS/s= github.com/gonvenience/neat v1.3.18 h1:WxWoXhsTHA6CStNrGgSEjGTt5MwIm+7Xs+VZmQIuXZA= github.com/gonvenience/neat v1.3.18/go.mod h1:DTaEyHIOjSkMa066EoZZl3k5KCG/rFGE67n0cjm/9qk= github.com/gonvenience/term v1.0.5 h1:PYfBH7FB1V+tuuJl4KYrqG/tzAOUnvTy8IFa9YqYrJY= @@ -37,6 +35,8 @@ github.com/gonvenience/text v1.0.10/go.mod h1:qO4aTZGAXbeW7eJXK+94nIc5Uumz8Q5DphOFZex6JHI= github.com/gonvenience/ytbx v1.4.8 h1:V7oea89gLUN1C0rGDHxnt1YMAd7wHau9LC80Ng2QauA= github.com/gonvenience/ytbx v1.4.8/go.mod h1:DVrIUZAiVv/bzOU3esvEvhGWED4YbyhSAuFru5nlzD4= +github.com/gonvenience/ytbx v1.4.9 h1:8n9kmCTrS0dna863abBI50fQT6/2397jpsSZr6ZsnHo= +github.com/gonvenience/ytbx v1.4.9/go.mod h1:5+Gl5Y0OxrO7Kp0qmrH8vTCAlY3whwBHN26KOReIe5o= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef h1:xpF9fUHpoIrrjX24DURVKiwHcFpw19ndIs+FwTSMbno= @@ -66,8 +66,8 @@ github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= -github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0= -github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/6d8ulp4AwfLKrmA= +github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= +github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI= github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28= @@ -104,25 +104,25 @@ github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 h1:JwtAtbp7r/7QSyGz8mKUbYJBg2+6Cd7OjM8o/GNOcVo= github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74/go.mod h1:RmMWU37GKR2s6pgrIEB4ixgpVCt/cf7dnJv3fuH1J1c= -go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= -go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= +go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= -golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI= +golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= -golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= -golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= -golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= +golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= +golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= +golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= +golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dyff-1.11.2/pkg/dyff/compare_test.go new/dyff-1.11.3/pkg/dyff/compare_test.go --- old/dyff-1.11.2/pkg/dyff/compare_test.go 2026-03-01 17:08:27.000000000 +0100 +++ new/dyff-1.11.3/pkg/dyff/compare_test.go 2026-03-17 14:28:35.000000000 +0100 @@ -1047,6 +1047,18 @@ Expect(results).ToNot(BeNil()) Expect(results.Diffs).To(HaveLen(1)) }) + + It("should threat an empty file as an empty document (null scalar)", func() { + from, to, err := ytbx.LoadFiles(assets("edge/empty/from.yml"), assets("edge/empty/to.yml")) + Expect(err).ToNot(HaveOccurred()) + Expect(from).ToNot(BeNil()) + Expect(to).ToNot(BeNil()) + + results, err := dyff.CompareInputFiles(from, to) + Expect(err).ToNot(HaveOccurred()) + Expect(results).ToNot(BeNil()) + Expect(results.Diffs).To(HaveLen(2)) + }) }) Context("input files containing Kubernetes resources", func() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dyff-1.11.2/pkg/dyff/core.go new/dyff-1.11.3/pkg/dyff/core.go --- old/dyff-1.11.2/pkg/dyff/core.go 2026-03-01 17:08:27.000000000 +0100 +++ new/dyff-1.11.3/pkg/dyff/core.go 2026-03-17 14:28:35.000000000 +0100 @@ -32,7 +32,7 @@ "github.com/gonvenience/text" "github.com/gonvenience/ytbx" - "github.com/mitchellh/hashstructure" + "github.com/mitchellh/hashstructure/v2" yamlv3 "go.yaml.in/yaml/v3" ) @@ -1091,10 +1091,10 @@ switch node.Kind { case yamlv3.MappingNode, yamlv3.SequenceNode: - hash, err = hashstructure.Hash(compare.basicType(node), nil) + hash, err = hashstructure.Hash(compare.basicType(node), hashstructure.FormatV2, nil) case yamlv3.ScalarNode: - hash, err = hashstructure.Hash(node.Tag+"/"+node.Value, nil) + hash, err = hashstructure.Hash(node.Tag+"/"+node.Value, hashstructure.FormatV2, nil) case yamlv3.AliasNode: hash = compare.calcNodeHash(followAlias(node)) ++++++ dyff.obsinfo ++++++ --- /var/tmp/diff_new_pack.74B92y/_old 2026-03-18 16:52:25.817836431 +0100 +++ /var/tmp/diff_new_pack.74B92y/_new 2026-03-18 16:52:25.829836926 +0100 @@ -1,5 +1,5 @@ name: dyff -version: 1.11.2 -mtime: 1772381307 -commit: 6c36ce0d21d83f307a4e76ee810d9657947e3cf9 +version: 1.11.3 +mtime: 1773754115 +commit: 4512053136bcd17cc8784b386f6c75bda7e01ec2 ++++++ vendor.tar.gz ++++++ ++++ 1675 lines of diff (skipped)
