Drop bzr dependency support (#553)

* Drop bzr dependency support * Update changelog entry for bzr change
heroku · Apr 23, 2024 · 18b1171 · 18b1171
1 parent f380d38
commit 18b1171
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+* Drop support for installing bzr-hosted dependencies directly; bzr-hosted
+  dependencies may still be installed via `GOPROXY`
+
 ## [v190] - 2024-04-05
 
 * Add go1.22.2

diff --git a/bin/compile b/bin/compile
@@ -24,7 +24,6 @@ GovendorVersion="$(<${DataJSON} jq -r '.Govendor.DefaultVersion')"
 GBVersion="$(<${DataJSON} jq -r '.GB.DefaultVersion')"
 PkgErrorsVersion="$(<${DataJSON} jq -r '.PkgErrors.DefaultVersion')"
 MercurialVersion="$(<${DataJSON} jq -r '.HG.DefaultVersion')"
-BazaarVersion="$(<${DataJSON} jq -r '.BZR.DefaultVersion')"
 MattesMigrateVersion="$(<${DataJSON} jq -r '.MattesMigrate.DefaultVersion')"
 GolangMigrateVersion="$(<${DataJSON} jq -r '.GolangMigrate.DefaultVersion')"
 TQVersion="$(<${DataJSON} jq -r '.tq.DefaultVersion')"

diff --git a/data.json b/data.json
@@ -103,9 +103,6 @@
   "HG": {
     "DefaultVersion": "3.9"
   },
-  "BZR": {
-    "DefaultVersion": "2.7.0"
-  },
   "MattesMigrate": {
     "DefaultVersion": "v3.0.0"
   },

diff --git a/files.json b/files.json
@@ -1,8 +1,4 @@
 {
-  "bzr-2.7.0.tar.gz": {
-    "SHA": "0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3",
-    "URL": "https://launchpad.net/bzr/2.7/2.7.0/+download/bzr-2.7.0.tar.gz"
-  },
   "dep-linux-amd64": {
     "Comment": "This is here for backwards compat. Remove after a while.",
     "LocalName": "dep",

diff --git a/test/fixtures/mod-with-bzr-dep/go.mod b/test/fixtures/mod-with-bzr-dep/go.mod
diff --git a/test/fixtures/mod-with-bzr-dep/go.sum b/test/fixtures/mod-with-bzr-dep/go.sum
diff --git a/test/fixtures/mod-with-bzr-dep/main.go b/test/fixtures/mod-with-bzr-dep/main.go
diff --git a/test/run.sh b/test/run.sh
@@ -1,21 +1,6 @@
 #!/usr/bin/env bash
 # See README.md for info on running these tests.
 
-testModWithBZRDep() {
-  fixture "mod-with-bzr-dep"
-
-  assertDetected
-
-  compile
-  assertModulesBoilerplateCaptured
-  assertGoInstallCaptured "go1.12.17"
-  assertGoInstallOnlyFixturePackageCaptured
-
-  assertCapturedExitSuccess
-  assertInstalledFixtureBinary
-  assertFile "web: bin/fixture" "Procfile"
-}
-
 testTestPackModulesVendoredGolangLintCI() {
   fixture "mod-deps-vendored-with-tests"