Update upstream source from tag 'upstream/0.7.0'

Update to upstream version '0.7.0'
with Debian dir ee25f3c

Author: anthonyfok

.github/dependabot.yml

@@ -0,0 +1,7 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci-test.yml

@@ -1,29 +1,31 @@
 name: CI Test
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   ci-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     strategy:
       matrix:
-        go-version: ['1.16.x', '1.17.x']
-    env:
-      GO111MODULE: on  # Needed for github.com/google/go-github/v38
+        go-version: ['1.21', '1.22']
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Install Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
+          check-latest: true
 
       - run: diff -u <(echo -n) <(gofmt -d -s .)
 
-      - run: go get -t -v ./...
+      - run: go install -v ./...
 
       - run: go test -v ./...
 
@@ -32,7 +34,7 @@ jobs:
       - name: apt install needed Debian packages
         run: |
           sudo eatmydata apt update
-          sudo eatmydata apt install git-buildpackage golang-any pristine-tar pandoc
+          sudo eatmydata apt install git-buildpackage pristine-tar pandoc
 
       - name: Generate man page from Markdown
         run: pandoc -f markdown -t man -s dh-make-golang.md -o dh-make-golang.1
@@ -46,7 +48,7 @@ jobs:
           ~/go/bin/dh-make-golang -type p -pristine-tar -program_package_name gh github.com/cli/cli
 
       - name: Upload dh-make-golang test run as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: dh-make-golang_test-run_go${{ matrix.go-version }}
           path: _test-run

check_depends.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"fmt"
-	"golang.org/x/mod/modfile"
-	"golang.org/x/tools/go/vcs"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
-	"pault.ag/go/debian/control"
 	"strings"
+
+	"golang.org/x/mod/modfile"
+	"golang.org/x/tools/go/vcs"
+	"pault.ag/go/debian/control"
 )
 
 type dependency struct {
@@ -92,7 +92,7 @@ func execCheckDepends(args []string) {
 // i.e. it returns the one defined in go.mod as well as the transitively ones
 // TODO: this may not be the best way of doing thing since it requires the package to be converted to go module
 func parseGoModDependencies(directory string, goBinaries map[string]string) ([]dependency, error) {
-	b, err := ioutil.ReadFile(filepath.Join(directory, "go.mod"))
+	b, err := os.ReadFile(filepath.Join(directory, "go.mod"))
 	if err != nil {
 		return nil, err
 	}

check_depends_test.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -18,7 +17,7 @@ Testsuite: autopkgtest-pkg-go
 Priority: optional
 Build-Depends:
  debhelper-compat (= 13),
- dh-golang,
+ dh-sequence-golang,
  golang-any,
  golang-github-advancedlogic-goose-dev,
  golang-github-fatih-color-dev,
@@ -43,7 +42,7 @@ Description: read your RSS feeds from your terminal
  Terminews is a terminal based application (TUI)
  that allows you to manage RSS resources and display their news feeds.
 `
-	tmpDir, err := ioutil.TempDir("", "dh-make-golang")
+	tmpDir, err := os.MkdirTemp("", "dh-make-golang")
 	if err != nil {
 		t.Fatalf("Could not create temp dir: %v", err)
 	}
@@ -52,7 +51,7 @@ Description: read your RSS feeds from your terminal
 	if err := os.MkdirAll(filepath.Join(tmpDir, "dummy-package", "debian"), 0750); err != nil {
 		t.Fatalf("Could not create dummy Debian package: %v", err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(tmpDir, "dummy-package", "debian", "control"), []byte(f), 0640); err != nil {
+	if err := os.WriteFile(filepath.Join(tmpDir, "dummy-package", "debian", "control"), []byte(f), 0640); err != nil {
 		t.Fatalf("Could not create dummy Debian package: %v", err)
 	}
 
@@ -96,10 +95,10 @@ go 1.16
 
 require (
 	github.com/charmbracelet/glamour v0.3.0
-	github.com/google/go-github/v38 v38.1.0
+	github.com/google/go-github/v60 v60.0.0
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
 )`
-	tmpDir, err := ioutil.TempDir("", "dh-make-golang")
+	tmpDir, err := os.MkdirTemp("", "dh-make-golang")
 	if err != nil {
 		t.Fatalf("Could not create temp dir: %v", err)
 	}
@@ -108,7 +107,7 @@ require (
 	if err := os.MkdirAll(filepath.Join(tmpDir, "dummy-package"), 0750); err != nil {
 		t.Fatalf("Could not create dummy Debian package: %v", err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(tmpDir, "dummy-package", "go.mod"), []byte(f), 0640); err != nil {
+	if err := os.WriteFile(filepath.Join(tmpDir, "dummy-package", "go.mod"), []byte(f), 0640); err != nil {
 		t.Fatalf("Could not create dummy Debian package: %v", err)
 	}
 

create_salsa_project.go

@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -41,7 +41,7 @@ func execCreateSalsaProject(args []string) {
 		log.Fatalf("http post: %s", err)
 	}
 	if got, want := resp.StatusCode, http.StatusOK; got != want {
-		b, _ := ioutil.ReadAll(resp.Body)
+		b, _ := io.ReadAll(resp.Body)
 		log.Fatalf("unexpected HTTP status code: got %d, want %d (response: %s)", got, want, string(b))
 	}
 }

estimate.go

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"go/build"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -59,7 +58,7 @@ func removeVendor(gopath string) (found bool, _ error) {
 
 func estimate(importpath string) error {
 	// construct a separate GOPATH in a temporary directory
-	gopath, err := ioutil.TempDir("", "dh-make-golang")
+	gopath, err := os.MkdirTemp("", "dh-make-golang")
 	if err != nil {
 		return fmt.Errorf("create temp dir: %w", err)
 	}

go.mod

@@ -1,15 +1,39 @@
 module github.com/Debian/dh-make-golang
 
-go 1.16
+go 1.21
+
+toolchain go1.22.1
 
 require (
-	github.com/charmbracelet/glamour v0.3.0
-	github.com/google/go-github/v38 v38.1.0
+	github.com/charmbracelet/glamour v0.3.1-0.20211129115518-6db32e77e152
+	github.com/google/go-github/v60 v60.0.0
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
-	github.com/mattn/go-isatty v0.0.12
-	golang.org/x/mod v0.5.1 // indirect
-	golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e
+	github.com/mattn/go-isatty v0.0.14
+	golang.org/x/mod v0.15.0
+	golang.org/x/net v0.21.0
+	golang.org/x/sync v0.6.0
+	golang.org/x/sys v0.17.0
+	golang.org/x/tools v0.13.0
+	golang.org/x/tools/go/vcs v0.1.0-deprecated
 	pault.ag/go/debian v0.12.0
 )
+
+require (
+	github.com/alecthomas/chroma v0.9.4 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/dlclark/regexp2 v1.4.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.16 // indirect
+	github.com/muesli/reflow v0.3.0 // indirect
+	github.com/muesli/termenv v0.9.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
+	github.com/yuin/goldmark v1.4.13 // indirect
+	github.com/yuin/goldmark-emoji v1.0.1 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
+	pault.ag/go/topsort v0.0.0-20160530003732-f98d2ad46e1a // indirect
+)