Prevent Python 3 build dependency

facette · Jul 16, 2015 · c36c7f2 · c36c7f2 · TomGudman · Jul 16, 2015
1 parent d8d8738
commit c36c7f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ go:
 
 before_install:
   - sudo apt-get update
-  - sudo apt-get install -qq python3 librrd-dev
+  - sudo apt-get install -qq librrd-dev
 
 script:
   - make test

diff --git a/Makefile b/Makefile
@@ -22,6 +22,9 @@ GOARCH ?= $(shell $(GO) env GOARCH)
 BUILD_NAME = facette-$(GOOS)-$(GOARCH)
 BUILD_DIR = build/$(BUILD_NAME)
 
+GOPATH = $(realpath $(BUILD_DIR)):$(realpath vendor)
+export GOPATH
+
 TAR ?= tar
 
 GOLINT ?= golint
@@ -112,7 +115,6 @@ PKG_SRC = $(wildcard pkg/*/*.go)
 PKG_LIST = $(wildcard pkg/*)
 
 $(BIN_OUTPUT): $(PKG_SRC) $(BIN_SRC) $(BUILD_DIR)/src/github.com/facette/facette
-	$(eval $(shell GOPATH=$(realpath $(BUILD_DIR)) vendor/vendorctl env))
 	@$(call mesg_start,$(notdir $@),Building $(notdir $@)...)
 	@install -d -m 0755 $(dir $@) && $(GO) build \
 			-ldflags " \
@@ -350,7 +352,6 @@ $(TEST_DIR):
 	@install -d -m 0755 $(TEST_DIR)
 
 $(PKG_LIST): $(TEST_DIR) $(BUILD_DIR)/src/github.com/facette/facette
-	$(eval $(shell GOPATH=$(realpath $(BUILD_DIR)) vendor/vendorctl env))
 	@$(call mesg_start,test,Testing $@ package...)
 	@(cd $(TEST_DIR) && $(GO) test -race -c -i ../../../$@ && \
 		(test ! -f ./$(@:pkg/%=%).test || ./$(@:pkg/%=%).test -test.v=true) && \