From d1a6d465f22cb6b91c029103ce70ab81da0f8b82 Mon Sep 17 00:00:00 2001 From: Vassil Kovatchev Date: Sun, 10 Mar 2024 16:20:36 -0400 Subject: [PATCH 1/3] Rename module to be able to use from other modules without 'replace' --- .github/workflows/go.yaml | 6 +++--- README.md | 8 ++++---- decode_test.go | 2 +- encode_test.go | 2 +- example_embedded_test.go | 2 +- go.mod | 2 +- limit_test.go | 2 +- node_test.go | 41 ++++++++++++++++++++------------------- 8 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index d2bb00b0..980a3350 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -28,7 +28,7 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v2 with: - path: ${{ github.workspace }}/go/src/gopkg.in/yaml.v3 + path: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3 - name: Set up Go ${{ matrix.go }} if: matrix.go != 'tip' uses: actions/setup-go@v2 @@ -56,6 +56,6 @@ jobs: echo "$GOROOT/bin" >> $GITHUB_PATH - run: go version - run: go get -t ./... - working-directory: ${{ github.workspace }}/go/src/gopkg.in/yaml.v3 + working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3 - run: go test . - working-directory: ${{ github.workspace }}/go/src/gopkg.in/yaml.v3 + working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3 diff --git a/README.md b/README.md index 08eb1bab..fc7cd97a 100644 --- a/README.md +++ b/README.md @@ -36,18 +36,18 @@ supported since they're a poor design and are gone in YAML 1.2. Installation and usage ---------------------- -The import path for the package is *gopkg.in/yaml.v3*. +The import path for the package is *github.com/zillow/go-yaml.v3*. To install it, run: - go get gopkg.in/yaml.v3 + go get github.com/zillow/go-yaml.v3 API documentation ----------------- If opened in a browser, the import path itself leads to the API documentation: - - [https://gopkg.in/yaml.v3](https://gopkg.in/yaml.v3) + - [https://github.com/zillow/go-yaml.v3](https://github.com/zillow/go-yaml.v3) API stability ------------- @@ -72,7 +72,7 @@ import ( "fmt" "log" - "gopkg.in/yaml.v3" + "github.com/zillow/go-yaml.v3" ) var data = ` diff --git a/decode_test.go b/decode_test.go index d2f93a44..a0d57333 100644 --- a/decode_test.go +++ b/decode_test.go @@ -25,8 +25,8 @@ import ( "strings" "time" + "github.com/zillow/go-yaml.v3" . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" ) var unmarshalIntTest = 123 diff --git a/encode_test.go b/encode_test.go index a257017f..1f59f6fd 100644 --- a/encode_test.go +++ b/encode_test.go @@ -26,8 +26,8 @@ import ( "net" "os" + "github.com/zillow/go-yaml.v3" . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" ) type jsonNumberT string diff --git a/example_embedded_test.go b/example_embedded_test.go index 9d17398a..73f8b134 100644 --- a/example_embedded_test.go +++ b/example_embedded_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "gopkg.in/yaml.v3" + "github.com/zillow/go-yaml.v3" ) // An example showing how to unmarshal embedded diff --git a/go.mod b/go.mod index f407ea32..cc38560d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module "gopkg.in/yaml.v3" +module "github.com/zillow/go-yaml.v3" require ( "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 diff --git a/limit_test.go b/limit_test.go index 07a3cbd4..fb308081 100644 --- a/limit_test.go +++ b/limit_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" + "github.com/zillow/go-yaml.v3" . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" ) var limitTests = []struct { diff --git a/node_test.go b/node_test.go index b7d0c9a3..400122ae 100644 --- a/node_test.go +++ b/node_test.go @@ -20,10 +20,11 @@ import ( "fmt" "os" - . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" "io" "strings" + + "github.com/zillow/go-yaml.v3" + . "gopkg.in/check.v1" ) var nodeTests = []struct { @@ -688,17 +689,17 @@ var nodeTests = []struct { Line: 3, Column: 4, }, { - Kind: yaml.ScalarNode, - Tag: "!!str", - Value: "c", + Kind: yaml.ScalarNode, + Tag: "!!str", + Value: "c", LineComment: "# IC", - Line: 5, - Column: 1, + Line: 5, + Column: 1, }, { - Kind: yaml.SequenceNode, - Tag: "!!seq", - Line: 6, - Column: 3, + Kind: yaml.SequenceNode, + Tag: "!!seq", + Line: 6, + Column: 3, Content: []*yaml.Node{{ Kind: yaml.ScalarNode, Tag: "!!str", @@ -707,17 +708,17 @@ var nodeTests = []struct { Column: 5, }}, }, { - Kind: yaml.ScalarNode, - Tag: "!!str", - Value: "d", + Kind: yaml.ScalarNode, + Tag: "!!str", + Value: "d", LineComment: "# ID", - Line: 7, - Column: 1, + Line: 7, + Column: 1, }, { - Kind: yaml.MappingNode, - Tag: "!!map", - Line: 8, - Column: 3, + Kind: yaml.MappingNode, + Tag: "!!map", + Line: 8, + Column: 3, Content: []*yaml.Node{{ Kind: yaml.ScalarNode, Tag: "!!str", From fb3a1f2d4cb0638633f6155bd8dfc0e7e153f911 Mon Sep 17 00:00:00 2001 From: Vassil Kovatchev Date: Sun, 10 Mar 2024 16:30:35 -0400 Subject: [PATCH 2/3] Remove .v3 from name --- .github/workflows/go.yaml | 6 +- README.md | 149 +------------------------------------- decode_test.go | 2 +- encode_test.go | 2 +- example_embedded_test.go | 2 +- go.mod | 2 +- limit_test.go | 2 +- node_test.go | 2 +- 8 files changed, 10 insertions(+), 157 deletions(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 980a3350..16923ec8 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -28,7 +28,7 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v2 with: - path: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3 + path: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml - name: Set up Go ${{ matrix.go }} if: matrix.go != 'tip' uses: actions/setup-go@v2 @@ -56,6 +56,6 @@ jobs: echo "$GOROOT/bin" >> $GITHUB_PATH - run: go version - run: go get -t ./... - working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3 + working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml - run: go test . - working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3 + working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml diff --git a/README.md b/README.md index fc7cd97a..5996ab20 100644 --- a/README.md +++ b/README.md @@ -1,150 +1,3 @@ # YAML support for the Go language -Introduction ------------- - -The yaml package enables Go programs to comfortably encode and decode YAML -values. It was developed within [Canonical](https://www.canonical.com) as -part of the [juju](https://juju.ubuntu.com) project, and is based on a -pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML) -C library to parse and generate YAML data quickly and reliably. - -Compatibility -------------- - -The yaml package supports most of YAML 1.2, but preserves some behavior -from 1.1 for backwards compatibility. - -Specifically, as of v3 of the yaml package: - - - YAML 1.1 bools (_yes/no, on/off_) are supported as long as they are being - decoded into a typed bool value. Otherwise they behave as a string. Booleans - in YAML 1.2 are _true/false_ only. - - Octals encode and decode as _0777_ per YAML 1.1, rather than _0o777_ - as specified in YAML 1.2, because most parsers still use the old format. - Octals in the _0o777_ format are supported though, so new files work. - - Does not support base-60 floats. These are gone from YAML 1.2, and were - actually never supported by this package as it's clearly a poor choice. - -and offers backwards -compatibility with YAML 1.1 in some cases. -1.2, including support for -anchors, tags, map merging, etc. Multi-document unmarshalling is not yet -implemented, and base-60 floats from YAML 1.1 are purposefully not -supported since they're a poor design and are gone in YAML 1.2. - -Installation and usage ----------------------- - -The import path for the package is *github.com/zillow/go-yaml.v3*. - -To install it, run: - - go get github.com/zillow/go-yaml.v3 - -API documentation ------------------ - -If opened in a browser, the import path itself leads to the API documentation: - - - [https://github.com/zillow/go-yaml.v3](https://github.com/zillow/go-yaml.v3) - -API stability -------------- - -The package API for yaml v3 will remain stable as described in [gopkg.in](https://gopkg.in). - - -License -------- - -The yaml package is licensed under the MIT and Apache License 2.0 licenses. -Please see the LICENSE file for details. - - -Example -------- - -```Go -package main - -import ( - "fmt" - "log" - - "github.com/zillow/go-yaml.v3" -) - -var data = ` -a: Easy! -b: - c: 2 - d: [3, 4] -` - -// Note: struct fields must be public in order for unmarshal to -// correctly populate the data. -type T struct { - A string - B struct { - RenamedC int `yaml:"c"` - D []int `yaml:",flow"` - } -} - -func main() { - t := T{} - - err := yaml.Unmarshal([]byte(data), &t) - if err != nil { - log.Fatalf("error: %v", err) - } - fmt.Printf("--- t:\n%v\n\n", t) - - d, err := yaml.Marshal(&t) - if err != nil { - log.Fatalf("error: %v", err) - } - fmt.Printf("--- t dump:\n%s\n\n", string(d)) - - m := make(map[interface{}]interface{}) - - err = yaml.Unmarshal([]byte(data), &m) - if err != nil { - log.Fatalf("error: %v", err) - } - fmt.Printf("--- m:\n%v\n\n", m) - - d, err = yaml.Marshal(&m) - if err != nil { - log.Fatalf("error: %v", err) - } - fmt.Printf("--- m dump:\n%s\n\n", string(d)) -} -``` - -This example will generate the following output: - -``` ---- t: -{Easy! {2 [3 4]}} - ---- t dump: -a: Easy! -b: - c: 2 - d: [3, 4] - - ---- m: -map[a:Easy! b:map[c:2 d:[3 4]]] - ---- m dump: -a: Easy! -b: - c: 2 - d: - - 3 - - 4 -``` - +Forked from https://github.com/go-yaml/yaml diff --git a/decode_test.go b/decode_test.go index a0d57333..bd510516 100644 --- a/decode_test.go +++ b/decode_test.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/zillow/go-yaml.v3" + "github.com/zillow/go-yaml" . "gopkg.in/check.v1" ) diff --git a/encode_test.go b/encode_test.go index 1f59f6fd..81ec187a 100644 --- a/encode_test.go +++ b/encode_test.go @@ -26,7 +26,7 @@ import ( "net" "os" - "github.com/zillow/go-yaml.v3" + "github.com/zillow/go-yaml" . "gopkg.in/check.v1" ) diff --git a/example_embedded_test.go b/example_embedded_test.go index 73f8b134..cce999d0 100644 --- a/example_embedded_test.go +++ b/example_embedded_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/zillow/go-yaml.v3" + "github.com/zillow/go-yaml" ) // An example showing how to unmarshal embedded diff --git a/go.mod b/go.mod index cc38560d..7735b35c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module "github.com/zillow/go-yaml.v3" +module "github.com/zillow/go-yaml" require ( "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 diff --git a/limit_test.go b/limit_test.go index fb308081..fc16d60a 100644 --- a/limit_test.go +++ b/limit_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/zillow/go-yaml.v3" + "github.com/zillow/go-yaml" . "gopkg.in/check.v1" ) diff --git a/node_test.go b/node_test.go index 400122ae..a6dda587 100644 --- a/node_test.go +++ b/node_test.go @@ -23,7 +23,7 @@ import ( "io" "strings" - "github.com/zillow/go-yaml.v3" + "github.com/zillow/go-yaml" . "gopkg.in/check.v1" ) From 860b7feefd90e63aa221bab017c6e469d403cd4f Mon Sep 17 00:00:00 2001 From: Vassil Kovatchev Date: Sun, 10 Mar 2024 16:42:31 -0400 Subject: [PATCH 3/3] Add /v3 to module name --- .github/workflows/go.yaml | 6 +++--- decode_test.go | 2 +- encode_test.go | 2 +- example_embedded_test.go | 2 +- go.mod | 2 +- limit_test.go | 2 +- node_test.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 16923ec8..a844199b 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -28,7 +28,7 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v2 with: - path: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml + path: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml/v3 - name: Set up Go ${{ matrix.go }} if: matrix.go != 'tip' uses: actions/setup-go@v2 @@ -56,6 +56,6 @@ jobs: echo "$GOROOT/bin" >> $GITHUB_PATH - run: go version - run: go get -t ./... - working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml + working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml/v3 - run: go test . - working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml + working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml/v3 diff --git a/decode_test.go b/decode_test.go index bd510516..54f50357 100644 --- a/decode_test.go +++ b/decode_test.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/zillow/go-yaml" + "github.com/zillow/go-yaml/v3" . "gopkg.in/check.v1" ) diff --git a/encode_test.go b/encode_test.go index 81ec187a..d594e265 100644 --- a/encode_test.go +++ b/encode_test.go @@ -26,7 +26,7 @@ import ( "net" "os" - "github.com/zillow/go-yaml" + "github.com/zillow/go-yaml/v3" . "gopkg.in/check.v1" ) diff --git a/example_embedded_test.go b/example_embedded_test.go index cce999d0..fd809a07 100644 --- a/example_embedded_test.go +++ b/example_embedded_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/zillow/go-yaml" + "github.com/zillow/go-yaml/v3" ) // An example showing how to unmarshal embedded diff --git a/go.mod b/go.mod index 7735b35c..6ce37bb7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module "github.com/zillow/go-yaml" +module "github.com/zillow/go-yaml/v3" require ( "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 diff --git a/limit_test.go b/limit_test.go index fc16d60a..73bd5cc0 100644 --- a/limit_test.go +++ b/limit_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/zillow/go-yaml" + "github.com/zillow/go-yaml/v3" . "gopkg.in/check.v1" ) diff --git a/node_test.go b/node_test.go index a6dda587..f2bb5bed 100644 --- a/node_test.go +++ b/node_test.go @@ -23,7 +23,7 @@ import ( "io" "strings" - "github.com/zillow/go-yaml" + "github.com/zillow/go-yaml/v3" . "gopkg.in/check.v1" )