Skip to content

Commit

Permalink
Added package dependencies with dep
Browse files Browse the repository at this point in the history
  • Loading branch information
fredericlemoine committed Jan 9, 2018
1 parent e9fd349 commit be2ac16
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*~
Gopkg.lock
vendor
13 changes: 1 addition & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
language: go

go:
- 1.6.4
- 1.7.4
- 1.8
- 1.9.2

install:
- go get -u github.com/fredericlemoine/bitset
- go get -u github.com/fredericlemoine/gostats
- go get -u github.com/fredericlemoine/goalign
- go get -u github.com/spf13/cobra
- go get -u github.com/golang/freetype/truetype
- go get -u github.com/llgcode/draw2d
- go get -u golang.org/x/image/font
- go get -u github.com/ajstarks/svgo
- go get -u github.com/jlaffaye/ftp
- go get -u github.com/golang/dep/cmd/dep
24 changes: 1 addition & 23 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
# 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/ajstarks/svgo"
Expand All @@ -30,7 +8,7 @@

[[constraint]]
name = "github.com/fredericlemoine/goalign"
version = "0.2.4"
version = "0.2.5"

[[constraint]]
name = "github.com/fredericlemoine/gostats"
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
DEP_EXECUTABLE := dep
GO_EXECUTABLE := go
VERSION := $(shell git describe --abbrev=10 --dirty --always --tags)
DIST_DIRS := find * -type d -exec
VERSION_PACKAGE := github.com/fredericlemoine/gotree/cmd.Version
NAME := gotree
PACKAGE:=github.com/fredericlemoine/gotree

all: build test install testcommands
all: dep build test install testcommands

dep:
${DEP_EXECUTABLE} ensure

build:
${GO_EXECUTABLE} build -o ${NAME} -ldflags "-X ${VERSION_PACKAGE}=${VERSION}" ${PACKAGE}
Expand Down
5 changes: 3 additions & 2 deletions io/nexus/nexus_parser_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package nexus_test

import (
"github.com/fredericlemoine/gotree/io/nexus"
"github.com/fredericlemoine/gotree/tree"
"strings"
"testing"

"github.com/fredericlemoine/gotree/io/nexus"
"github.com/fredericlemoine/gotree/tree"
)

// Ensure the parser can parse strings into Statement ASTs.
Expand Down

0 comments on commit be2ac16

Please sign in to comment.