Merge branch 'develop'

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+<!-- Please describe your changes on the following line: -->
+
+
+---
+<!-- Thank you for contributing to TES! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
+- [ ] `make` does not report any errors
+- [ ] These changes fix #__ (github issue number if applicable).
+
+<!-- Either: -->
+- [ ] There are documentation for these changes OR
+- [ ] These changes do not require documentation because _____
+
+<!-- Either: -->
+- [ ] There are tests for these changes OR
+- [ ] These changes do not require tests because _____
+
+<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Makefile

@@ -1,4 +1,3 @@
-
 GOPATH := $(shell pwd)
 export GOPATH
 PATH := ${PATH}:$(shell pwd)/bin
@@ -10,17 +9,17 @@ server:
 	go install tes-server
 	go install tes-worker
 
-proto_build: 
+proto_build:
 	cd task-execution-schemas/proto && protoc $(PROTO_INC) \
 		--go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:../../src/tes/ga4gh/ \
 		--grpc-gateway_out=logtostderr=true:../../src/tes/ga4gh/ \
 		task_execution.proto
 	cd proto && protoc \
-	  $(PROTO_INC) \
-	  -I ../task-execution-schemas/proto/ \
-	  --go_out=Mtask_execution.proto=tes/ga4gh,plugins=grpc:../src/tes/server/proto \
+		$(PROTO_INC) \
+		-I ../task-execution-schemas/proto/ \
+		--go_out=Mtask_execution.proto=tes/ga4gh,plugins=grpc:../src/tes/server/proto \
 		task_worker.proto
-	
+
 grpc:
 	go get -u github.com/golang/protobuf/protoc-gen-go
 	go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
@@ -29,4 +28,17 @@ grpc:
 depends: grpc
 	go get -d tes-server/
 	go get -d tes-worker/
-
+
+golint:
+	go get -v github.com/golang/lint/golint/
+
+tidy: golint
+	@for f in $$(find $(GOPATH)/src/tes* -name '*.go'); \
+	do \
+		gofmt -w $$f; \
+		golint $$f; \
+	done
+	@for d in $(GOPATH)/src/tes*; \
+	do \
+		go tool vet $$d; \
+	done

README.md

@@ -1,3 +1,7 @@
+master: ![master-build-status](https://travis-ci.org/bmeg/task-execution-server.svg?branch=master)
+
+develop: ![develop-build-status](https://travis-ci.org/bmeg/task-execution-server.svg?branch=develop)
+
 # task-execution-server
 
 ## Initial tool install
@@ -38,6 +42,6 @@ pip install pyyaml
 
 ## Run Example workflow
 ```
-python funnel/main.py --tes tes.yaml test/hashsplitter-workflow.cwl --input README.md 
+python funnel/main.py --tes tes.yaml test/hashsplitter-workflow.cwl --input README.md
 
 ```