Merge pull request #305 from maxmind/greg/7.0.0

Release 7.0.0 and 7.0.1

CHANGELOG.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
-## 7.0.0
+## 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.
   The client now calls two new endpoints:

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`.
 

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.

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?"

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.

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) {

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"

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() {

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

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.

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) {

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 {

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

internal/vars/version.go

@@ -2,4 +2,4 @@
 package vars
 
 // Version defines the current geoipupdate version.
-var Version = "6.1.0"
+var Version = "7.0.1"