Use vendor/ instead of godep

abh · Jul 8, 2016 · 4d60839 · 4d60839
1 parent a707483
commit 4d60839
Show file tree

Hide file tree

Showing 260 changed files with 269 additions and 254 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,22 @@
 language: go
 go:
-  - 1.4
+  - 1.5.4
-  - 1.5
+  - 1.6.2
-  - 1.6
   - tip
+
+env:
+  global:
+  - GO15VENDOREXPERIMENT='1'
+
 before_install:
   - sudo apt-get install libgeoip-dev bzr
+
 install:
   - mkdir -p $TRAVIS_BUILD_DIR/db
   - curl -s http://geodns.bitnames.com/geoip/GeoLiteCity.dat.gz | gzip -cd > $TRAVIS_BUILD_DIR/db/GeoIPCity.dat
   - curl -s http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz | gzip -cd > $TRAVIS_BUILD_DIR/db/GeoIPASNum.dat
   - echo [geodns] >> dns/geodns.conf
   - echo Directory=$TRAVIS_BUILD_DIR/db >> dns/geodns.conf
-  - go get github.com/abh/dns
-  - go get github.com/abh/geoip
-  - go get gopkg.in/check.v1
-  - go get -v
   - go build -v
   - go install
 

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/LICENSE b/Godeps/_workspace/src/code.google.com/p/gcfg/LICENSE
diff --git a/Godeps/_workspace/src/code.google.com/p/gcfg/README b/Godeps/_workspace/src/code.google.com/p/gcfg/README
diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/printer_test.go b/Godeps/_workspace/src/gopkg.in/check.v1/printer_test.go
diff --git a/config.go b/config.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/abh/geodns/Godeps/_workspace/src/code.google.com/p/gcfg"
+	"gopkg.in/fsnotify.v1"
-	"github.com/abh/geodns/Godeps/_workspace/src/gopkg.in/fsnotify.v1"
+	"gopkg.in/gcfg.v1"
 )
 
 type AppConfig struct {

diff --git a/geodns.go b/geodns.go
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/pborman/uuid"
+	"github.com/pborman/uuid"
 )
 
 // VERSION is the current version of GeoDNS

diff --git a/geoip.go b/geoip.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/abh/geoip"
 	"github.com/abh/geodns/countries"
+	"github.com/abh/geoip"
 	"log"
 	"net"
 	"strings"

diff --git a/metrics.go b/metrics.go
@@ -4,7 +4,7 @@ import (
 	"runtime"
 	"time"
 
-	metrics "github.com/abh/geodns/Godeps/_workspace/src/github.com/rcrowley/go-metrics"
+	metrics "github.com/rcrowley/go-metrics"
 )
 
 type ServerMetrics struct {

diff --git a/monitor.go b/monitor.go
@@ -15,8 +15,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/rcrowley/go-metrics"
+	"github.com/rcrowley/go-metrics"
-	"github.com/abh/geodns/Godeps/_workspace/src/golang.org/x/net/websocket"
+	"golang.org/x/net/websocket"
 )
 
 // Initial status message on websocket

diff --git a/monitor_test.go b/monitor_test.go
@@ -2,11 +2,12 @@ package main
 
 import (
 	"fmt"
-	. "github.com/abh/geodns/Godeps/_workspace/src/gopkg.in/check.v1"
 	"io/ioutil"
 	"net/http"
 	"strings"
 	"time"
+
+	. "gopkg.in/check.v1"
 )
 
 type MonitorSuite struct {

diff --git a/picker.go b/picker.go
@@ -3,7 +3,7 @@ package main
 import (
 	"math/rand"
 
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/miekg/dns"
+	"github.com/miekg/dns"
 )
 
 func (label *Label) Picker(qtype uint16, max int) Records {

diff --git a/serve.go b/serve.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/miekg/dns"
+	"github.com/miekg/dns"
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/rcrowley/go-metrics"
+	"github.com/rcrowley/go-metrics"
 )
 
 func getQuestionName(z *Zone, req *dns.Msg) string {

diff --git a/serve_test.go b/serve_test.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/miekg/dns"
+	"github.com/miekg/dns"
-	. "github.com/abh/geodns/Godeps/_workspace/src/gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 )
 
 const (

diff --git a/stathat.go b/stathat.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/rcrowley/go-metrics"
+	"github.com/rcrowley/go-metrics"
-	"github.com/abh/geodns/Godeps/_workspace/src/github.com/stathat/go"
+	"github.com/stathat/go"
 )
 
 func (zs *Zones) statHatPoster() {

diff --git a/targeting_test.go b/targeting_test.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	. "github.com/abh/geodns/Godeps/_workspace/src/gopkg.in/check.v1"
+	. "gopkg.in/check.v1"
 	"net"
 )
 

diff --git a/...ce/src/github.com/abh/errorutil/README.md → vendor/github.com/abh/errorutil/README.md b/...ce/src/github.com/abh/errorutil/README.md → vendor/github.com/abh/errorutil/README.md
diff --git a/...src/github.com/abh/errorutil/highlight.go → vendor/github.com/abh/errorutil/highlight.go b/...src/github.com/abh/errorutil/highlight.go → vendor/github.com/abh/errorutil/highlight.go
diff --git a/...space/src/github.com/abh/geoip/.gitignore → vendor/github.com/abh/geoip/.gitignore b/...space/src/github.com/abh/geoip/.gitignore → vendor/github.com/abh/geoip/.gitignore
diff --git a/...pace/src/github.com/abh/geoip/.travis.yml → vendor/github.com/abh/geoip/.travis.yml b/...pace/src/github.com/abh/geoip/.travis.yml → vendor/github.com/abh/geoip/.travis.yml
diff --git a/...orkspace/src/github.com/abh/geoip/LICENSE → vendor/github.com/abh/geoip/LICENSE b/...orkspace/src/github.com/abh/geoip/LICENSE → vendor/github.com/abh/geoip/LICENSE
diff --git a/...kspace/src/github.com/abh/geoip/README.md → vendor/github.com/abh/geoip/README.md b/...kspace/src/github.com/abh/geoip/README.md → vendor/github.com/abh/geoip/README.md
diff --git a/...rkspace/src/github.com/abh/geoip/const.go → vendor/github.com/abh/geoip/const.go b/...rkspace/src/github.com/abh/geoip/const.go → vendor/github.com/abh/geoip/const.go
diff --git a/...ce/src/github.com/abh/geoip/db/.gitignore → vendor/github.com/abh/geoip/db/.gitignore b/...ce/src/github.com/abh/geoip/db/.gitignore → vendor/github.com/abh/geoip/db/.gitignore
diff --git a/...pace/src/github.com/abh/geoip/db/download → vendor/github.com/abh/geoip/db/download b/...pace/src/github.com/abh/geoip/db/download → vendor/github.com/abh/geoip/db/download
diff --git a/...src/github.com/abh/geoip/ex/geoip-demo.go → vendor/github.com/abh/geoip/ex/geoip-demo.go b/...src/github.com/abh/geoip/ex/geoip-demo.go → vendor/github.com/abh/geoip/ex/geoip-demo.go
diff --git a/...rkspace/src/github.com/abh/geoip/geoip.go → vendor/github.com/abh/geoip/geoip.go b/...rkspace/src/github.com/abh/geoip/geoip.go → vendor/github.com/abh/geoip/geoip.go
diff --git a/...ce/src/github.com/abh/geoip/geoip_test.go → vendor/github.com/abh/geoip/geoip_test.go b/...ce/src/github.com/abh/geoip/geoip_test.go → vendor/github.com/abh/geoip/geoip_test.go
diff --git a/...rc/github.com/abh/geoip/test-db/GeoIP.dat → ...or/github.com/abh/geoip/test-db/GeoIP.dat b/...rc/github.com/abh/geoip/test-db/GeoIP.dat → ...or/github.com/abh/geoip/test-db/GeoIP.dat
diff --git a/...ithub.com/abh/geoip/test-db/GeoIPCity.dat → ...ithub.com/abh/geoip/test-db/GeoIPCity.dat b/...ithub.com/abh/geoip/test-db/GeoIPCity.dat → ...ithub.com/abh/geoip/test-db/GeoIPCity.dat
diff --git a/...hub.com/abh/geoip/test-db/GeoIPRegion.dat → ...hub.com/abh/geoip/test-db/GeoIPRegion.dat b/...hub.com/abh/geoip/test-db/GeoIPRegion.dat → ...hub.com/abh/geoip/test-db/GeoIPRegion.dat
diff --git a/...space/src/github.com/miekg/dns/.gitignore → vendor/github.com/miekg/dns/.gitignore b/...space/src/github.com/miekg/dns/.gitignore → vendor/github.com/miekg/dns/.gitignore
diff --git a/...pace/src/github.com/miekg/dns/.travis.yml → vendor/github.com/miekg/dns/.travis.yml b/...pace/src/github.com/miekg/dns/.travis.yml → vendor/github.com/miekg/dns/.travis.yml
diff --git a/...orkspace/src/github.com/miekg/dns/AUTHORS → vendor/github.com/miekg/dns/AUTHORS b/...orkspace/src/github.com/miekg/dns/AUTHORS → vendor/github.com/miekg/dns/AUTHORS
diff --git a/...ace/src/github.com/miekg/dns/CONTRIBUTORS → vendor/github.com/miekg/dns/CONTRIBUTORS b/...ace/src/github.com/miekg/dns/CONTRIBUTORS → vendor/github.com/miekg/dns/CONTRIBUTORS
diff --git a/...kspace/src/github.com/miekg/dns/COPYRIGHT → vendor/github.com/miekg/dns/COPYRIGHT b/...kspace/src/github.com/miekg/dns/COPYRIGHT → vendor/github.com/miekg/dns/COPYRIGHT
diff --git a/...orkspace/src/github.com/miekg/dns/LICENSE → vendor/github.com/miekg/dns/LICENSE b/...orkspace/src/github.com/miekg/dns/LICENSE → vendor/github.com/miekg/dns/LICENSE
diff --git a/...kspace/src/github.com/miekg/dns/README.md → vendor/github.com/miekg/dns/README.md b/...kspace/src/github.com/miekg/dns/README.md → vendor/github.com/miekg/dns/README.md
diff --git a/...kspace/src/github.com/miekg/dns/client.go → vendor/github.com/miekg/dns/client.go b/...kspace/src/github.com/miekg/dns/client.go → vendor/github.com/miekg/dns/client.go
diff --git a/...e/src/github.com/miekg/dns/client_test.go → vendor/github.com/miekg/dns/client_test.go b/...e/src/github.com/miekg/dns/client_test.go → vendor/github.com/miekg/dns/client_test.go
diff --git a/.../src/github.com/miekg/dns/clientconfig.go → vendor/github.com/miekg/dns/clientconfig.go b/.../src/github.com/miekg/dns/clientconfig.go → vendor/github.com/miekg/dns/clientconfig.go
diff --git a/...github.com/miekg/dns/clientconfig_test.go → ...github.com/miekg/dns/clientconfig_test.go b/...github.com/miekg/dns/clientconfig_test.go → ...github.com/miekg/dns/clientconfig_test.go
diff --git a/...pace/src/github.com/miekg/dns/defaults.go → vendor/github.com/miekg/dns/defaults.go b/...pace/src/github.com/miekg/dns/defaults.go → vendor/github.com/miekg/dns/defaults.go
diff --git a/...workspace/src/github.com/miekg/dns/dns.go → vendor/github.com/miekg/dns/dns.go b/...workspace/src/github.com/miekg/dns/dns.go → vendor/github.com/miekg/dns/dns.go
diff --git a/...pace/src/github.com/miekg/dns/dns_test.go → vendor/github.com/miekg/dns/dns_test.go b/...pace/src/github.com/miekg/dns/dns_test.go → vendor/github.com/miekg/dns/dns_test.go
diff --git a/...kspace/src/github.com/miekg/dns/dnssec.go → vendor/github.com/miekg/dns/dnssec.go b/...kspace/src/github.com/miekg/dns/dnssec.go → vendor/github.com/miekg/dns/dnssec.go
diff --git a/...src/github.com/miekg/dns/dnssec_keygen.go → vendor/github.com/miekg/dns/dnssec_keygen.go b/...src/github.com/miekg/dns/dnssec_keygen.go → vendor/github.com/miekg/dns/dnssec_keygen.go
diff --git a/...rc/github.com/miekg/dns/dnssec_keyscan.go → ...or/github.com/miekg/dns/dnssec_keyscan.go b/...rc/github.com/miekg/dns/dnssec_keyscan.go → ...or/github.com/miekg/dns/dnssec_keyscan.go
diff --git a/...rc/github.com/miekg/dns/dnssec_privkey.go → ...or/github.com/miekg/dns/dnssec_privkey.go b/...rc/github.com/miekg/dns/dnssec_privkey.go → ...or/github.com/miekg/dns/dnssec_privkey.go
diff --git a/...e/src/github.com/miekg/dns/dnssec_test.go → vendor/github.com/miekg/dns/dnssec_test.go b/...e/src/github.com/miekg/dns/dnssec_test.go → vendor/github.com/miekg/dns/dnssec_test.go
diff --git a/.../src/github.com/miekg/dns/dnsutil/util.go → vendor/github.com/miekg/dns/dnsutil/util.go b/.../src/github.com/miekg/dns/dnsutil/util.go → vendor/github.com/miekg/dns/dnsutil/util.go
diff --git a/...github.com/miekg/dns/dnsutil/util_test.go → ...github.com/miekg/dns/dnsutil/util_test.go b/...github.com/miekg/dns/dnsutil/util_test.go → ...github.com/miekg/dns/dnsutil/util_test.go
diff --git a/...workspace/src/github.com/miekg/dns/doc.go → vendor/github.com/miekg/dns/doc.go b/...workspace/src/github.com/miekg/dns/doc.go → vendor/github.com/miekg/dns/doc.go
diff --git a/...pace/src/github.com/miekg/dns/dyn_test.go → vendor/github.com/miekg/dns/dyn_test.go b/...pace/src/github.com/miekg/dns/dyn_test.go → vendor/github.com/miekg/dns/dyn_test.go
diff --git a/...orkspace/src/github.com/miekg/dns/edns.go → vendor/github.com/miekg/dns/edns.go b/...orkspace/src/github.com/miekg/dns/edns.go → vendor/github.com/miekg/dns/edns.go
diff --git a/...ace/src/github.com/miekg/dns/edns_test.go → vendor/github.com/miekg/dns/edns_test.go b/...ace/src/github.com/miekg/dns/edns_test.go → vendor/github.com/miekg/dns/edns_test.go
diff --git a/.../src/github.com/miekg/dns/example_test.go → vendor/github.com/miekg/dns/example_test.go b/.../src/github.com/miekg/dns/example_test.go → vendor/github.com/miekg/dns/example_test.go
diff --git a/...kspace/src/github.com/miekg/dns/format.go → vendor/github.com/miekg/dns/format.go b/...kspace/src/github.com/miekg/dns/format.go → vendor/github.com/miekg/dns/format.go
diff --git a/...ace/src/github.com/miekg/dns/fuzz_test.go → vendor/github.com/miekg/dns/fuzz_test.go b/...ace/src/github.com/miekg/dns/fuzz_test.go → vendor/github.com/miekg/dns/fuzz_test.go
diff --git a/...c/github.com/miekg/dns/idn/code_points.go → ...r/github.com/miekg/dns/idn/code_points.go b/...c/github.com/miekg/dns/idn/code_points.go → ...r/github.com/miekg/dns/idn/code_points.go