alias godeps to dep for backwards compatibility for ci-run

addyess · Aug 9, 2018 · d6ce202 · d6ce202
1 parent 471295c
commit d6ce202
Show file tree

Hide file tree

Showing 7 changed files with 3,659 additions and 67 deletions.
diff --git a/.ipynb_checkpoints/Untitled-checkpoint.ipynb b/.ipynb_checkpoints/Untitled-checkpoint.ipynb
@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -162,7 +162,7 @@ Staying up-to-date
 ------------------
 
 The [Gopkg.lock](Gopkg.lock) file can get out of date, for
-example when you made change to Gopkg.toml.  When it is out of date, run
+example when you have changed Gopkg.toml. When it is out of date, run
 `dep`. In practice, you can wait until you get a compile error about
 an external package not existing/having an incorrect API, and then rerun
 `dep ensure -v`.

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -24,13 +24,8 @@
 #   go-tests = true
 #   unused-packages = true
 
-
-# [prune]  # no prune because ./patchs was based on raw src with tests
-#   go-tests = true
-#   unused-packages = true
-
 [[override]]
-  name = "google.golang.org/cloud"  # why this dep is still in depdendencies.tsv ?
+  name = "google.golang.org/cloud"
   revision = "f20d6dcccb44ed49de45ae3703312cb46e627db1"
 
 [[override]]
@@ -259,7 +254,7 @@
 
 [[constraint]]
   name = "github.com/gorilla/websocket"
-  revision = "804cb600d06b10672f2fbc0a336a7bee507a428e"
+  revision = "5ed622c449da6d44c3c8329331ff47a9e5844f71"
 
 [[constraint]]
   name = "github.com/hashicorp/raft"
@@ -524,59 +519,3 @@
 [[constraint]]
   name = "github.com/docker/distribution"
   revision = "f0cc927784781fa395c06317c58dea2841ece3a9"
-
-# [[constraint]]  # ?? do we need below dependencies here - can find any place imports them.
-#   name = "github.com/ncw/swift"
-#   revision = "b2a7479cf26fa841ff90dd932d0221cb5c50782d"
-
-# [[constraint]]
-#   name = "github.com/masterzen/simplexml"
-#   revision = "4572e39b1ab9fe03ee513ce6fc7e289e98482190"
-
-# [[constraint]]
-#   name = "github.com/cloud-green/monitoring"
-#   revision = "666e3beca3cb4f6b5c8f176ba80daf2b3adbd84e"
-
-# [[constraint]]
-#   name = "github.com/juju/go4"
-#   revision = "40d72ab9641a2a8c36a9c46a51e28367115c8e59"
-
-# [[constraint]]
-#   name = "github.com/juju/gojsonpointer"
-#   revision = "afe8b77aa08f272b49e01b82de78510c11f61500"
-
-# [[constraint]]
-#   name = "github.com/juju/gojsonreference"
-#   revision = "f0d24ac5ee330baa21721cdff56d45e4ee42628e"
-
-# [[constraint]]
-#   name = "github.com/juju/httpprof"
-#   revision = "14bf14c307672fd2456bdbf35d19cf0ccd3cf565"
-
-# [[constraint]]
-#   name = "github.com/juju/mempool"
-#   revision = "24974d6c264fe5a29716e7d56ea24c4bd904b7cc"
-
-# [[constraint]]
-#   name = "github.com/juju/zip"
-#   revision = "f6b1e93fa2e29a1d7d49b566b2b51efb060c982a"
-
-# [[constraint]]
-#   name = "github.com/nu7hatch/gouuid"
-#   revision = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"
-
-# [[constraint]]
-#   name = "github.com/rogpeppe/fastuuid"
-#   revision = "6724a57986aff9bff1a1770e9347036def7c89f6"
-
-# [[constraint]]
-#   name = "gopkg.in/juju/jujusvg.v3"
-#   revision = "1ebf5c5481e815de683e57e0f46705ac567e4e58"
-
-# [[constraint]]
-#   name = "gopkg.in/tomb.v1"
-#   revision = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"
-
-# [[constraint]]
-#   name = "gopkg.in/macaroon.v2"
-#   revision = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0"
diff --git a/Makefile b/Makefile
@@ -37,7 +37,10 @@ default: build
 # and will only work - when this tree is found on the GOPATH.
 ifeq ($(CURDIR),$(PROJECT_DIR))
 
-ifeq ($(JUJU_MAKE_GODEPS),true)  # ?? change this to JUJU_MAKE_DEP
+# keep this for backwards compatibility for ci-run on 2.4, 2.3 branchs
+JUJU_MAKE_DEP ?= $(JUJU_MAKE_GODEPS)
+
+ifeq ($(JUJU_MAKE_DEP),true)
 $(GOPATH)/bin/dep:
 	go get -u github.com/golang/dep/cmd/dep
 
@@ -49,6 +52,9 @@ dep:
 	@echo "skipping dep"
 endif
 
+# keep this for backwards compatibility for ci-run on 2.4, 2.3 branchs
+godeps: dep
+
 build: dep go-build
 
 add-patches:

diff --git a/Untitled-checkpoint.ipynb b/Untitled-checkpoint.ipynb
@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 2
+}