diff --git a/CHANGELOG.md b/CHANGELOG.md index b676e94..1b62fea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 7.0.1 (2024-04-08) + +* The 7.0.0 release was broken and has been retracted. This release updates the + module path to match tagged version. Reported by Adam Weinberger. GitHub #306. + ## 7.0.0 (2024-04-08) * BREAKING CHANGE: Improvements to the HTTP download API. diff --git a/README.md b/README.md index 7541873..4e5aec8 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ website](https://golang.org). The easiest way is via `go install`: - $ go install github.com/maxmind/geoipupdate/v6/cmd/geoipupdate@latest + $ go install github.com/maxmind/geoipupdate/v7/cmd/geoipupdate@latest This installs `geoipupdate` to `$GOPATH/bin/geoipupdate`. diff --git a/client/download.go b/client/download.go index 0f47b7c..f7d24cc 100644 --- a/client/download.go +++ b/client/download.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/maxmind/geoipupdate/v6/internal" - "github.com/maxmind/geoipupdate/v6/internal/vars" + "github.com/maxmind/geoipupdate/v7/internal" + "github.com/maxmind/geoipupdate/v7/internal/vars" ) // DownloadResponse describes the result of a Download call. diff --git a/client/metadata.go b/client/metadata.go index f83e732..d6119ee 100644 --- a/client/metadata.go +++ b/client/metadata.go @@ -9,8 +9,8 @@ import ( "net/url" "strconv" - "github.com/maxmind/geoipupdate/v6/internal" - "github.com/maxmind/geoipupdate/v6/internal/vars" + "github.com/maxmind/geoipupdate/v7/internal" + "github.com/maxmind/geoipupdate/v7/internal/vars" ) const metadataEndpoint = "%s/geoip/updates/metadata?" diff --git a/cmd/geoipupdate/args.go b/cmd/geoipupdate/args.go index 382a296..d992191 100644 --- a/cmd/geoipupdate/args.go +++ b/cmd/geoipupdate/args.go @@ -7,7 +7,7 @@ import ( flag "github.com/spf13/pflag" - "github.com/maxmind/geoipupdate/v6/internal/vars" + "github.com/maxmind/geoipupdate/v7/internal/vars" ) // Args are command line arguments. diff --git a/cmd/geoipupdate/end_to_end_test.go b/cmd/geoipupdate/end_to_end_test.go index 5b9d904..3f50f11 100644 --- a/cmd/geoipupdate/end_to_end_test.go +++ b/cmd/geoipupdate/end_to_end_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/maxmind/geoipupdate/v6/internal/geoipupdate" + "github.com/maxmind/geoipupdate/v7/internal/geoipupdate" ) func TestUpdater(t *testing.T) { diff --git a/cmd/geoipupdate/main.go b/cmd/geoipupdate/main.go index 371b22e..d7ce94e 100644 --- a/cmd/geoipupdate/main.go +++ b/cmd/geoipupdate/main.go @@ -5,8 +5,8 @@ import ( "context" "log" - "github.com/maxmind/geoipupdate/v6/internal/geoipupdate" - "github.com/maxmind/geoipupdate/v6/internal/vars" + "github.com/maxmind/geoipupdate/v7/internal/geoipupdate" + "github.com/maxmind/geoipupdate/v7/internal/vars" ) const unknownVersion = "unknown" diff --git a/cmd/geoipupdate/version.go b/cmd/geoipupdate/version.go index cd79020..da7a4b9 100644 --- a/cmd/geoipupdate/version.go +++ b/cmd/geoipupdate/version.go @@ -6,7 +6,7 @@ package main import ( "runtime/debug" - "github.com/maxmind/geoipupdate/v6/internal/vars" + "github.com/maxmind/geoipupdate/v7/internal/vars" ) func init() { diff --git a/go.mod b/go.mod index 7754167..b44356a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/maxmind/geoipupdate/v6 +module github.com/maxmind/geoipupdate/v7 go 1.20 @@ -21,3 +21,6 @@ require ( gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// The module version (v6) did not match the tag version in this release. +retract v7.0.0 diff --git a/internal/geoipupdate/config.go b/internal/geoipupdate/config.go index 3114c35..e1d4ee6 100644 --- a/internal/geoipupdate/config.go +++ b/internal/geoipupdate/config.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/maxmind/geoipupdate/v6/internal/vars" + "github.com/maxmind/geoipupdate/v7/internal/vars" ) // Config is a parsed configuration file. diff --git a/internal/geoipupdate/config_test.go b/internal/geoipupdate/config_test.go index 3ae5769..44800f1 100644 --- a/internal/geoipupdate/config_test.go +++ b/internal/geoipupdate/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/maxmind/geoipupdate/v6/internal/vars" + "github.com/maxmind/geoipupdate/v7/internal/vars" ) func TestNewConfig(t *testing.T) { diff --git a/internal/geoipupdate/geoip_updater.go b/internal/geoipupdate/geoip_updater.go index e41c1f2..2e4b73f 100644 --- a/internal/geoipupdate/geoip_updater.go +++ b/internal/geoipupdate/geoip_updater.go @@ -14,9 +14,9 @@ import ( "github.com/cenkalti/backoff/v4" - "github.com/maxmind/geoipupdate/v6/client" - "github.com/maxmind/geoipupdate/v6/internal" - "github.com/maxmind/geoipupdate/v6/internal/geoipupdate/database" + "github.com/maxmind/geoipupdate/v7/client" + "github.com/maxmind/geoipupdate/v7/internal" + "github.com/maxmind/geoipupdate/v7/internal/geoipupdate/database" ) type updateClient interface { diff --git a/internal/geoipupdate/geoip_updater_test.go b/internal/geoipupdate/geoip_updater_test.go index 0808ead..2776007 100644 --- a/internal/geoipupdate/geoip_updater_test.go +++ b/internal/geoipupdate/geoip_updater_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/http2" - "github.com/maxmind/geoipupdate/v6/client" - "github.com/maxmind/geoipupdate/v6/internal" - "github.com/maxmind/geoipupdate/v6/internal/geoipupdate/database" + "github.com/maxmind/geoipupdate/v7/client" + "github.com/maxmind/geoipupdate/v7/internal" + "github.com/maxmind/geoipupdate/v7/internal/geoipupdate/database" ) // TestUpdaterOutput makes sure that the Updater outputs the result of its