From 5dd0fecc62e806b5d3752a1fffd1e8e1d17d032d Mon Sep 17 00:00:00 2001 From: Ryan O'Hara-Reid Date: Thu, 1 Nov 2018 17:40:54 +1100 Subject: [PATCH] Adds go module support that came into effect in go version 1.11 (#201) Adds go module support that came into effect in go version 1.11 --- .travis.yml | 17 ++++-------- Gopkg.lock | 72 ------------------------------------------------ Gopkg.toml | 46 ------------------------------- go.mod | 14 ++++++++++ go.sum | 16 +++++++++++ testdata/test.sh | 19 ------------- 6 files changed, 36 insertions(+), 148 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod create mode 100644 go.sum delete mode 100755 testdata/test.sh diff --git a/.travis.yml b/.travis.yml index ec529317..7df09b9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,17 +15,12 @@ matrix: - language: go go: - - 1.10.x - before_install: - - go get -t -v ./... + - 1.11.x + env: + - GO111MODULE=on + install: true + script: - - ./testdata/test.sh - install: - - go get github.com/gorilla/websocket - - go get github.com/toorop/go-pusher - - go get github.com/thrasher-/socketio - - go get github.com/beatgammit/turnpike - - go get github.com/gorilla/mux - - go get golang.org/x/crypto/scrypt + - go test -race -coverprofile=./testdata/coverage.txt -covermode=atomic ./... after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index b0387754..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,72 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "v2" - name = "github.com/beatgammit/turnpike" - packages = ["."] - revision = "573f579df7ee6b7f2962625d35a624d11222f2ec" - -[[projects]] - name = "github.com/gorilla/context" - packages = ["."] - revision = "1ea25387ff6f684839d82767c1733ff4d4d15d0a" - version = "v1.1" - -[[projects]] - name = "github.com/gorilla/mux" - packages = ["."] - revision = "53c1911da2b537f792e7cafcb446b05ffe33b996" - version = "v1.6.1" - -[[projects]] - name = "github.com/gorilla/websocket" - packages = ["."] - revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" - version = "v1.2.0" - -[[projects]] - branch = "master" - name = "github.com/streamrail/concurrent-map" - packages = ["."] - revision = "8bf1e9bacbf65b10c81d0f4314cf2b1ebef728b5" - -[[projects]] - branch = "master" - name = "github.com/thrasher-/socketio" - packages = ["."] - revision = "38b9599889b97e3f897b32ca075eff4e5338342b" - -[[projects]] - branch = "master" - name = "github.com/toorop/go-pusher" - packages = ["."] - revision = "4549deda570234e4f8e9fd0d69c149d4dc07d0c9" - -[[projects]] - name = "github.com/ugorji/go" - packages = ["codec"] - revision = "9831f2c3ac1068a78f50999a30db84270f647af6" - version = "v1.1" - -[[projects]] - branch = "master" - name = "golang.org/x/crypto" - packages = [ - "pbkdf2", - "scrypt" - ] - revision = "df8d4716b3472e4a531c33cedbe537dae921a1a9" - -[[projects]] - branch = "master" - name = "golang.org/x/net" - packages = ["websocket"] - revision = "309822c5b9b9f80db67f016069a12628d94fad34" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "b77f3524104c74cc3e20314a7eff2b79bb9cbd19fd81671226ef998e4e816412" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 1c11c102..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,46 +0,0 @@ - -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - - -[[constraint]] - branch = "v2" - name = "github.com/beatgammit/turnpike" - -[[constraint]] - name = "github.com/gorilla/mux" - version = "1.6.1" - -[[constraint]] - name = "github.com/gorilla/websocket" - version = "1.2.0" - -[[constraint]] - branch = "master" - name = "github.com/thrasher-/socketio" - -[[constraint]] - branch = "master" - name = "github.com/toorop/go-pusher" - -[[constraint]] - branch = "master" - name = "golang.org/x/crypto" diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..45285c84 --- /dev/null +++ b/go.mod @@ -0,0 +1,14 @@ +module github.com/thrasher-/gocryptotrader + +require ( + github.com/beatgammit/turnpike v0.0.0-20170911161258-573f579df7ee // indirect + github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect + github.com/gorilla/mux v1.6.1 + github.com/gorilla/websocket v1.2.0 + github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6 // indirect + github.com/thrasher-/socketio v0.0.0-20150420123453-38b9599889b9 // indirect + github.com/toorop/go-pusher v0.0.0-20180107133620-4549deda5702 + github.com/ugorji/go v0.0.0-20180112141927-9831f2c3ac10 // indirect + golang.org/x/crypto v0.0.0-20180602220124-df8d4716b347 + golang.org/x/net v0.0.0-20180201030042-309822c5b9b9 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..50bbc184 --- /dev/null +++ b/go.sum @@ -0,0 +1,16 @@ +github.com/beatgammit/turnpike v0.0.0-20170911161258-573f579df7ee/go.mod h1:nLl3qHMc5xKNLHHm/T7qBzrYGKSCJqLnFVLb2B5RvGI= +github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f h1:9oNbS1z4rVpbnkHBdPZU4jo9bSmrLpII768arSyMFgk= +github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.1 h1:KOwqsTYZdeuMacU7CxjMNYEKeBvLbxW+psodrbcEa3A= +github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v1.2.0 h1:VJtLvh6VQym50czpZzx07z/kw9EgAxI3x1ZB8taTMQQ= +github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6/go.mod h1:yqDD2twFAqxvvH5gtpwwgLsj5L1kbNwtoPoDOwBzXcs= +github.com/thrasher-/socketio v0.0.0-20150420123453-38b9599889b9/go.mod h1:DydgNAaAwBGaWoA4dQXHEj74QymzhVeTlZhlc7uWFzg= +github.com/toorop/go-pusher v0.0.0-20180107133620-4549deda5702 h1:5++uRlIqjhFXdgYOontPMHx6MQLun4kekOL/5AjC384= +github.com/toorop/go-pusher v0.0.0-20180107133620-4549deda5702/go.mod h1:VTLqNCX1tXrur6pdIRCl8Q90FR7nw/mEBdyMkWMcsb0= +github.com/ugorji/go v0.0.0-20180112141927-9831f2c3ac10/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= +golang.org/x/crypto v0.0.0-20180602220124-df8d4716b347 h1:+jjpoZyGXummmGKty7FoOcAE9yNHXYwr4nOv+07g6X4= +golang.org/x/crypto v0.0.0-20180602220124-df8d4716b347/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20180201030042-309822c5b9b9 h1:+Va2hqur1pIoaZgDZSzTxfatSy6IY0IOu7qmCh8b2W8= +golang.org/x/net v0.0.0-20180201030042-309822c5b9b9/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/testdata/test.sh b/testdata/test.sh deleted file mode 100755 index ec56d6e2..00000000 --- a/testdata/test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [ -n "$TRAVIS_BUILD_DIR" ]; then - cd $TRAVIS_BUILD_DIR -else - cd $GOPATH/src/github.com/thrasher-/gocryptotrader -fi - -echo "" > testdata/coverage.txt - -for d in $(go list ./... | grep -v vendor); do - go test -race -coverprofile=profile.out -covermode=atomic -cover $d - if [ -f profile.out ]; then - cat profile.out >> testdata/coverage.txt - rm profile.out - fi -done