Bump Go versions for Travis

.travis.yml

@@ -26,11 +26,11 @@ matrix:
       env: RUN_LONG_TESTS=no
   fast_finish: true
   include:
-    - go: 1.9.x
-      env: RUN_LONG_TESTS=no
     - go: 1.10.x
-      env: RUN_LONG_TESTS=yes
+      env: RUN_LONG_TESTS=no
     - go: 1.11.x
+      env: RUN_LONG_TESTS=yes
+    - go: 1.12.x
       env:
         - RUN_LONG_TESTS=yes
         - DEPLOY_BINARIES=yes

Makefile

@@ -11,8 +11,6 @@ TESTS?=
 BINPATH?=$(GOPATH)/bin
 RUN_LONG_TESTS?=yes
 
-GO_1_10_AND_HIGHER=$(shell (printf '%s\n' go1.10 $(GOVERSION) | sort -cV >/dev/null 2>&1) && echo "yes")
-
 all: test bench check system-test
 
 prepare:
@@ -51,14 +49,10 @@ ifeq ($(RUN_LONG_TESTS), yes)
 endif
 
 test:
-ifeq ($(GO_1_10_AND_HIGHER), yes)
 	go test -v ./... -gocheck.v=true -race -coverprofile=coverage.txt -covermode=atomic
-else
-	go test -v `go list ./... | grep -v vendor/` -gocheck.v=true
-endif
 
 bench:
-	go test -v ./deb -run=nothing -bench=. -benchmem 
+	go test -v ./deb -run=nothing -bench=. -benchmem
 
 mem.png: mem.dat mem.gp
 	gnuplot mem.gp

README.rst

@@ -64,7 +64,7 @@ If you would like to use nightly builds (unstable), please use following reposit
 
 Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_.
 
-If you have Go environment set up, you can build aptly from source by running (go 1.9+ required)::
+If you have Go environment set up, you can build aptly from source by running (go 1.10+ required)::
 
     mkdir -p $GOPATH/src/github.com/aptly-dev/aptly
     git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly

system/t08_db/cleanup.py

@@ -109,8 +109,8 @@ class CleanupDB9Test(BaseTest):
     runCmd = "aptly db cleanup"
 
     def check(self):
-            self.check_output()
-            self.check_cmd_output("aptly publish drop def", "publish_drop", match_prepare=self.expand_environ)
+        self.check_output()
+        self.check_cmd_output("aptly publish drop def", "publish_drop", match_prepare=self.expand_environ)
 
 
 class CleanupDB10Test(BaseTest):