From d202f8a94c4a84a91e8e931c517f0cf6254c8fc8 Mon Sep 17 00:00:00 2001 From: mixeme Date: Tue, 16 Jun 2026 08:12:14 +0300 Subject: [PATCH] Replace archived YAML dependency Switch direct YAML usage from gopkg.in/yaml.v3 to go.yaml.in/yaml/v4, the maintained YAML org fork of the archived go-yaml repository. Update README dependency and mirroring links so the documented source repository matches the module used by the application. --- README.md | 4 ++-- go.mod | 3 ++- go.sum | 2 ++ src/core/store.go | 2 +- src/core/store_test.go | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 93dd279..e936ab1 100644 --- a/README.md +++ b/README.md @@ -324,7 +324,7 @@ PySentry keeps the direct dependency list intentionally small: - [`fyne.io/fyne/v2`](https://fyne.io/) for the native GUI. - `github.com/robfig/cron/v3` for cron schedule parsing. -- `gopkg.in/yaml.v3` for YAML settings and jobs. +- [`go.yaml.in/yaml/v4`](https://github.com/yaml/go-yaml) for YAML settings and jobs. The remaining entries in `go.mod` are indirect dependencies pulled by Fyne and the Go module resolver. @@ -333,7 +333,7 @@ Source repositories for mirroring: - Go toolchain: https://go.googlesource.com/go - Fyne: https://github.com/fyne-io/fyne - robfig/cron: https://github.com/robfig/cron -- go-yaml/yaml: https://github.com/go-yaml/yaml +- yaml/go-yaml: https://github.com/yaml/go-yaml To list every direct and indirect Go module used by the current checkout: diff --git a/go.mod b/go.mod index 968f746..0b1be0e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( fyne.io/fyne/v2 v2.5.3 github.com/robfig/cron/v3 v3.0.1 - gopkg.in/yaml.v3 v3.0.1 + go.yaml.in/yaml/v4 v4.0.0-rc.5 ) require ( @@ -37,4 +37,5 @@ require ( golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.16.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index dc91322..d487803 100644 --- a/go.sum +++ b/go.sum @@ -300,6 +300,8 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.yaml.in/yaml/v4 v4.0.0-rc.5 h1:JVliQq9EGOYaTgMi+k8BhUJyqcGk4ZqeuiN1Cirba9c= +go.yaml.in/yaml/v4 v4.0.0-rc.5/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/src/core/store.go b/src/core/store.go index 81e0723..1b5eabf 100644 --- a/src/core/store.go +++ b/src/core/store.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) type Store struct { diff --git a/src/core/store_test.go b/src/core/store_test.go index 2a44516..5fc84f2 100644 --- a/src/core/store_test.go +++ b/src/core/store_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) func TestJobsYAMLDoesNotPersistRuntimeNoise(t *testing.T) {