From 5faa7516f209bbb6baf94433bc36839f8d7db362 Mon Sep 17 00:00:00 2001 From: Ron Evans Date: Tue, 15 Oct 2019 09:21:19 +0200 Subject: [PATCH] core: updating to use go modules in build and completely remove dep Signed-off-by: Ron Evans --- .travis.yml | 5 +- Gopkg.lock | 436 ----------------------------------------- Gopkg.toml | 90 --------- Makefile | 9 +- appveyor.yml | 1 + go.mod | 2 +- go.sum | 1 + travis_build_opencv.sh | 2 +- 8 files changed, 7 insertions(+), 539 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml diff --git a/.travis.yml b/.travis.yml index 16418062..c7ac9d20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ go_import_path: gobot.io/x/gobot go: - 1.11.x - 1.12.x + - 1.13.x - tip matrix: allow_failures: @@ -39,15 +40,13 @@ before_install: - export PKG_CONFIG_PATH=$(pkg-config --variable pc_path pkg-config):$HOME/usr/lib/pkgconfig - export INCLUDE_PATH=$HOME/usr/include:${INCLUDE_PATH} - export LD_LIBRARY_PATH=$HOME/usr/lib:${LD_LIBRARY_PATH} + - export GO111MODULE=on - sudo ln /dev/null /dev/raw1394 - cd $HOME/gopath/src/gobot.io/x/gobot - go get github.com/axw/gocov/gocov - - go get -u github.com/golang/dep/cmd/dep - go get -u github.com/stretchr/testify before_cache: - rm -f $HOME/fresh-cache -install: - - dep ensure before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index c1da607a..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,436 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "master" - digest = "1:da54e55f2f63347514121c0d7b53631970367b26281d057ec66925c57324b8f1" - name = "github.com/bmizerany/pat" - packages = ["."] - pruneopts = "" - revision = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00" - -[[projects]] - digest = "1:141635a36d65611d06a05ec1d17be950e386426b6540169fe7c9476df41f6493" - name = "github.com/cpuguy83/go-md2man" - packages = ["md2man"] - pruneopts = "" - revision = "7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19" - version = "v1.0.10" - -[[projects]] - digest = "1:2a3e7762c7601d229c2e3e24122391d2640d2036c63b95e712576641129cfbc1" - name = "github.com/creack/goselect" - packages = ["."] - pruneopts = "" - revision = "c98c4e62c41618cf78d3ff759af0d4dbaa677748" - version = "v0.1.0" - -[[projects]] - branch = "master" - digest = "1:917123ed8122468eb815cc418af3bbf298c91f9cb1c36164e063f50e1a726e97" - name = "github.com/donovanhide/eventsource" - packages = ["."] - pruneopts = "" - revision = "3ed64d21fb0b6bd8b49bcfec08f3004daee8723d" - -[[projects]] - digest = "1:392ebbe504a822b15b41dd09cecc5baa98e9e0942502950dc14ba1f23c149e32" - name = "github.com/eclipse/paho.mqtt.golang" - packages = [ - ".", - "packets", - ] - pruneopts = "" - revision = "adca289fdcf8c883800aafa545bc263452290bae" - version = "v1.2.0" - -[[projects]] - branch = "master" - digest = "1:096920b06385101f5eee18c51987e481f2c0093f9dcc0661d38327f4d2acaafb" - name = "github.com/go-ble/ble" - packages = [ - ".", - "darwin", - "linux", - "linux/adv", - "linux/att", - "linux/gatt", - "linux/hci", - "linux/hci/cmd", - "linux/hci/evt", - "linux/hci/socket", - ] - pruneopts = "" - revision = "e4c77014ff5a22003a43b91ce1c53381ac9de901" - -[[projects]] - digest = "1:4b6a43ba3296f26ea01ae125e50951f141c215dd18b5b91e9f397117b2951eb1" - name = "github.com/gobuffalo/uuid" - packages = ["."] - pruneopts = "" - revision = "3f701655805f1ef76e9963d1b377497a0c66d7cd" - version = "v2.0.5" - -[[projects]] - digest = "1:141cc9fc6279592458b304038bd16a05ef477d125c6dad281216345a11746fd7" - name = "github.com/gofrs/uuid" - packages = ["."] - pruneopts = "" - revision = "6b08a5c5172ba18946672b49749cde22873dd7c2" - version = "v3.2.0" - -[[projects]] - digest = "1:8e3bd93036b4a925fe2250d3e4f38f21cadb8ef623561cd80c3c50c114b13201" - name = "github.com/hashicorp/errwrap" - packages = ["."] - pruneopts = "" - revision = "8a6fb523712970c966eefc6b39ed2c5e74880354" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:27c5db168bd1132f99ef53ce03f598014c9f24bf087edf473299beffcd00aff0" - name = "github.com/hashicorp/go-multierror" - packages = ["."] - pruneopts = "" - revision = "bdca7bb83f603b80ef756bb953fe1dafa9cd00a2" - -[[projects]] - branch = "master" - digest = "1:aba830e5898f09dd06027a27a10f4d44e8b0762a3ba0c83a771a01f4e72b81c3" - name = "github.com/hybridgroup/go-ardrone" - packages = [ - "client", - "client/commands", - "client/navdata", - ] - pruneopts = "" - revision = "b9750d8d7b78f9638e5fdd899835e99d46b5a56c" - -[[projects]] - branch = "master" - digest = "1:9956f4f58b2ccea25656086bcd7be0273915961a8231965a1a6c886874172054" - name = "github.com/hybridgroup/mjpeg" - packages = ["."] - pruneopts = "" - revision = "4680f319790ebffe28bbee775ecd1725693731ca" - -[[projects]] - digest = "1:85fdd2ce48a3fd1ddc4671b972f50a47dcf2eebb24813e90b28a8a1fcf65ee5a" - name = "github.com/mattn/go-colorable" - packages = ["."] - pruneopts = "" - revision = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - version = "v0.1.1" - -[[projects]] - digest = "1:d0600e4cf07697303f37130791b2ce4577367931416bea8ec4f601bde3f7c5bf" - name = "github.com/mattn/go-isatty" - packages = ["."] - pruneopts = "" - revision = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7" - version = "v0.0.7" - -[[projects]] - branch = "master" - digest = "1:50416da10e189bc201e122e20078fb8e680a439cbdd24aaece06c434b4415b60" - name = "github.com/mgutz/ansi" - packages = ["."] - pruneopts = "" - revision = "9520e82c474b0a04dd04f8a40959027271bab992" - -[[projects]] - digest = "1:47af139ef25cee26d54b8422b73a043ab5d8f5ec26a1ae49d3ca9212f1dbfdac" - name = "github.com/mgutz/logxi" - packages = ["v1"] - pruneopts = "" - revision = "aebf8a7d67ab4625e0fd4a665766fef9a709161b" - version = "v1" - -[[projects]] - digest = "1:2b5ed2cf6e8623bddd5653cffb8c6e462c2390b70186eb01546539aa177bb194" - name = "github.com/nats-io/go-nats" - packages = [ - ".", - "encoders/builtin", - "util", - ] - pruneopts = "" - revision = "70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - version = "v1.7.2" - -[[projects]] - digest = "1:0006112541eed60bdfa279c8965c038865f05a677d980305dae7a0eec5bd133c" - name = "github.com/nats-io/nkeys" - packages = ["."] - pruneopts = "" - revision = "1546a3320a8f195a5b5c84aef8309377c2e411d5" - version = "v0.0.2" - -[[projects]] - digest = "1:9abd194bb617fe4df66607ca59812ca91caeb2053c8c9869d3507939bb63cc0b" - name = "github.com/nats-io/nuid" - packages = ["."] - pruneopts = "" - revision = "4b96681fa6d28dd0ab5fe79bac63b3a493d9ee94" - version = "v1.0.1" - -[[projects]] - digest = "1:1d7e1867c49a6dd9856598ef7c3123604ea3daabf5b83f303ff457bcbc410b1d" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "" - revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" - version = "v0.8.1" - -[[projects]] - branch = "master" - digest = "1:41063c4ea00780183e5fb9452c30b4cb1b6fa998d56c10fec102e76cb67e8f91" - name = "github.com/raff/goble" - packages = ["xpc"] - pruneopts = "" - revision = "5a206277e7359d09af80eb4519b8fa331f5ac7da" - -[[projects]] - digest = "1:87dffed114a34c714199c74e15c04ecb1c332c669f63f722220a5e4e6eb2ef52" - name = "github.com/russross/blackfriday" - packages = ["."] - pruneopts = "" - revision = "d3b5b032dc8e8927d31a5071b56e14c89f045135" - version = "v2.0.1" - -[[projects]] - digest = "1:42a59e0ee70c485f96de4a30f86f88266d50b50f918053dec798f0cb2b4b7a88" - name = "github.com/shurcooL/sanitized_anchor_name" - packages = ["."] - pruneopts = "" - revision = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:eb22cc3727f58f5939373c397b0b9a8076f63e5b19584dcc00901dc5d407a77b" - name = "github.com/sigurn/crc8" - packages = ["."] - pruneopts = "" - revision = "e55481d6f45c5a8f040343bace9013571dae103e" - -[[projects]] - branch = "master" - digest = "1:52ed74cbf4d1bb1975642c817ec91b221c8963fa599885319407bf468431851d" - name = "github.com/sigurn/utils" - packages = ["."] - pruneopts = "" - revision = "f19e41f79f8f006116f682c1af454591bc278ad4" - -[[projects]] - branch = "master" - digest = "1:5a80808c3292ff8a8a7c340b8e4b4b4253eae8a6831fa3d506b232c8f5564ccf" - name = "github.com/tarm/serial" - packages = ["."] - pruneopts = "" - revision = "98f6abe2eb07edd42f6dfa2a934aea469acc29b7" - -[[projects]] - digest = "1:c6b7dd6b1f602f71a9522d03a65150ace6550839b71c543efa5686d56686c913" - name = "github.com/urfave/cli" - packages = ["."] - pruneopts = "" - revision = "bfe2e925cfb6d44b40ad3a779165ea7e8aff9212" - version = "v1.22.0" - -[[projects]] - digest = "1:4aa77644fa15ef170580070adcb70bd0adb02b0980bcc632eeaa528fd0e8137e" - name = "github.com/veandco/go-sdl2" - packages = ["sdl"] - pruneopts = "" - revision = "271d2ec43388932fd2a80f4c2e81021734685a62" - version = "v0.3" - -[[projects]] - branch = "master" - digest = "1:488c97dd29d2f0ddb48e8a04aed2da02f43efbd6e6c9a7bf9653819f55c8e90c" - name = "go.bug.st/serial.v1" - packages = [ - ".", - "unixutils", - ] - pruneopts = "" - revision = "5f7892a7bb453066bdc6683b9b5d24d9dee03ec1" - -[[projects]] - digest = "1:d09fcb53c57fc77049863d8ebd502f0be5f9c1038ee3d3387002bdc778902aa2" - name = "gobot.io/x/gobot" - packages = [ - ".", - "api", - "api/robeaux", - "drivers/aio", - "drivers/gpio", - "drivers/i2c", - "drivers/spi", - "gobottest", - "platforms/audio", - "platforms/beaglebone", - "platforms/ble", - "platforms/chip", - "platforms/dexter/gopigo3", - "platforms/digispark", - "platforms/dji/tello", - "platforms/firmata", - "platforms/firmata/client", - "platforms/holystone/hs200", - "platforms/intel-iot/curie", - "platforms/intel-iot/edison", - "platforms/intel-iot/joule", - "platforms/joystick", - "platforms/keyboard", - "platforms/leap", - "platforms/mavlink", - "platforms/mavlink/common", - "platforms/megapi", - "platforms/microbit", - "platforms/mqtt", - "platforms/nats", - "platforms/neurosky", - "platforms/opencv", - "platforms/parrot/ardrone", - "platforms/parrot/bebop", - "platforms/parrot/bebop/client", - "platforms/parrot/minidrone", - "platforms/particle", - "platforms/pebble", - "platforms/raspi", - "platforms/sphero", - "platforms/sphero/bb8", - "platforms/sphero/ollie", - "platforms/sphero/sprkplus", - "platforms/tinkerboard", - "platforms/upboard/up2", - "sysfs", - ] - pruneopts = "" - revision = "7f973dfdceeb4d20fe9b778b6b6fe24ee98a22d3" - version = "v1.13.0" - -[[projects]] - digest = "1:bd14b92557afd9859b571c7a1469f52d2f35402eb2dfe8e54e461a30e081461c" - name = "gocv.io/x/gocv" - packages = ["."] - pruneopts = "" - revision = "0f87fa5ef3fd497562e89a821fd87a77c28cb8ea" - version = "v0.20.0" - -[[projects]] - branch = "master" - digest = "1:5b3e9450868bcf9ecbca2b01ac04f142255b5744d89ec97e1ceedf57d4522645" - name = "golang.org/x/crypto" - packages = [ - "ed25519", - "ed25519/internal/edwards25519", - ] - pruneopts = "" - revision = "22d7a77e9e5f409e934ed268692e56707cd169e5" - -[[projects]] - branch = "master" - digest = "1:c7da5579c766c6c7f70fb5c0ca8062114e7fcb6bb6b2cb163152a2ec9cec1846" - name = "golang.org/x/net" - packages = [ - "internal/socks", - "proxy", - "websocket", - ] - pruneopts = "" - revision = "018c4d40a106a7ae83689758294fcd8d23850745" - -[[projects]] - branch = "master" - digest = "1:f8fc28f6666a22fb927b5a600299968203845989eba90b977525f3dcf37afd7e" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - ] - pruneopts = "" - revision = "c432e742b0af385916e013f6a34e9e73d139cf82" - -[[projects]] - digest = "1:fc039eb7ce53b7c46253f4c6fa15da847e2b6b0142cc7f970e611b5db64403f2" - name = "periph.io/x/periph" - packages = [ - ".", - "conn", - "conn/gpio", - "conn/gpio/gpioreg", - "conn/i2c", - "conn/i2c/i2creg", - "conn/physic", - "conn/pin", - "conn/spi", - "conn/spi/spireg", - "host/fs", - "host/sysfs", - ] - pruneopts = "" - revision = "df7c7a4f8f86972b1474695daf94a84c9165faed" - version = "v3.5.0" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/bmizerany/pat", - "github.com/hybridgroup/mjpeg", - "github.com/tarm/serial", - "github.com/urfave/cli", - "github.com/veandco/go-sdl2/sdl", - "gobot.io/x/gobot", - "gobot.io/x/gobot/api", - "gobot.io/x/gobot/api/robeaux", - "gobot.io/x/gobot/drivers/aio", - "gobot.io/x/gobot/drivers/gpio", - "gobot.io/x/gobot/drivers/i2c", - "gobot.io/x/gobot/drivers/spi", - "gobot.io/x/gobot/gobottest", - "gobot.io/x/gobot/platforms/audio", - "gobot.io/x/gobot/platforms/beaglebone", - "gobot.io/x/gobot/platforms/ble", - "gobot.io/x/gobot/platforms/chip", - "gobot.io/x/gobot/platforms/dexter/gopigo3", - "gobot.io/x/gobot/platforms/digispark", - "gobot.io/x/gobot/platforms/dji/tello", - "gobot.io/x/gobot/platforms/firmata", - "gobot.io/x/gobot/platforms/firmata/client", - "gobot.io/x/gobot/platforms/holystone/hs200", - "gobot.io/x/gobot/platforms/intel-iot/curie", - "gobot.io/x/gobot/platforms/intel-iot/edison", - "gobot.io/x/gobot/platforms/intel-iot/joule", - "gobot.io/x/gobot/platforms/joystick", - "gobot.io/x/gobot/platforms/keyboard", - "gobot.io/x/gobot/platforms/leap", - "gobot.io/x/gobot/platforms/mavlink", - "gobot.io/x/gobot/platforms/mavlink/common", - "gobot.io/x/gobot/platforms/megapi", - "gobot.io/x/gobot/platforms/microbit", - "gobot.io/x/gobot/platforms/mqtt", - "gobot.io/x/gobot/platforms/nats", - "gobot.io/x/gobot/platforms/neurosky", - "gobot.io/x/gobot/platforms/opencv", - "gobot.io/x/gobot/platforms/parrot/ardrone", - "gobot.io/x/gobot/platforms/parrot/bebop", - "gobot.io/x/gobot/platforms/parrot/bebop/client", - "gobot.io/x/gobot/platforms/parrot/minidrone", - "gobot.io/x/gobot/platforms/particle", - "gobot.io/x/gobot/platforms/pebble", - "gobot.io/x/gobot/platforms/raspi", - "gobot.io/x/gobot/platforms/sphero", - "gobot.io/x/gobot/platforms/sphero/bb8", - "gobot.io/x/gobot/platforms/sphero/ollie", - "gobot.io/x/gobot/platforms/sphero/sprkplus", - "gobot.io/x/gobot/platforms/tinkerboard", - "gobot.io/x/gobot/platforms/upboard/up2", - "gocv.io/x/gocv", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 6dde9037..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,90 +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 = "master" - name = "github.com/bmizerany/pat" - -[[constraint]] - name = "github.com/urfave/cli" - version = "1.20.0" - -[[constraint]] - branch = "master" - name = "github.com/donovanhide/eventsource" - -[[constraint]] - name = "github.com/eclipse/paho.mqtt.golang" - version = "1.2.0" - -[[constraint]] - branch = "master" - name = "github.com/go-ble/ble" - -[[constraint]] - branch = "master" - name = "github.com/hashicorp/go-multierror" - -[[constraint]] - branch = "master" - name = "github.com/hybridgroup/go-ardrone" - -[[constraint]] - name = "github.com/nats-io/go-nats" - version = "1.3.0" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.8.0" - -[[constraint]] - branch = "master" - name = "github.com/sigurn/crc8" - -[[constraint]] - branch = "master" - name = "github.com/tarm/serial" - -[[constraint]] - name = "github.com/veandco/go-sdl2" - version = "0.3.0" - -[[constraint]] - branch = "master" - name = "go.bug.st/serial.v1" - -[[constraint]] - name = "gocv.io/x/gocv" - version = "0.20.0" - -[[constraint]] - name = "periph.io/x/periph" - version = "3.5.0" - -[[constraint]] - branch = "master" - name = "golang.org/x/net" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "1.2.2" diff --git a/Makefile b/Makefile index 581a6450..6a94dc09 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: test race cover robeaux examples deps test_with_coverage fmt_check +.PHONY: test race cover robeaux examples test_with_coverage fmt_check excluding_vendor := $(shell go list ./... | grep -v /vendor/) @@ -18,13 +18,6 @@ fmt_check: test_with_coverage: ./ci/test.sh -deps: -ifeq (,$(shell which dep)) - $(error dep tool not found! https://github.com/golang/dep is required to install Gobot deps) -endif - dep ensure - - robeaux: ifeq (,$(shell which go-bindata)) $(error robeaux not built! https://github.com/jteeuwen/go-bindata is required to build robeaux assets ) diff --git a/appveyor.yml b/appveyor.yml index 2c7a350a..b5d5a467 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,7 @@ clone_folder: c:\gopath\src\gobot.io\x\gobot environment: GOPATH: c:\gopath GOROOT: c:\go + GO111MODULE: on install: - echo %PATH% diff --git a/go.mod b/go.mod index 28e9b385..3e6bda37 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/urfave/cli v1.22.1 github.com/veandco/go-sdl2 v0.3.3 go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 - gocv.io/x/gocv v0.20.0 + gocv.io/x/gocv v0.21.0 golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc // indirect golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24 // indirect diff --git a/go.sum b/go.sum index 181a4481..a64ba2e1 100644 --- a/go.sum +++ b/go.sum @@ -77,6 +77,7 @@ go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 h1:mACY1anK6HNCZtm/DK2Rf2 go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw= gocv.io/x/gocv v0.20.0 h1:2q75zQ8Zel2tB69G6qrmf/E7EdvaCs90qvkHzdSBOAg= gocv.io/x/gocv v0.20.0/go.mod h1:vZETJRwLnl11muQ6iL3q4ju+0oJRrdmYdv5xJTH7WYA= +gocv.io/x/gocv v0.21.0/go.mod h1:Rar2PS6DV+T4FL+PM535EImD/h13hGVaHhnCu1xarBs= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/travis_build_opencv.sh b/travis_build_opencv.sh index 9a383bcf..db3dc483 100755 --- a/travis_build_opencv.sh +++ b/travis_build_opencv.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eux -o pipefail -OPENCV_VERSION=${OPENCV_VERSION:-4.1.0} +OPENCV_VERSION=${OPENCV_VERSION:-4.1.2} #GRAPHICAL=ON GRAPHICAL=${GRAPHICAL:-OFF}