From 5bbbd0edc5313cbb4f8d5052baf3fabb47bf14ae Mon Sep 17 00:00:00 2001
From: Jonas Haag <jonas.haag@jda.com>
Date: Tue, 26 Nov 2019 16:13:14 +0100
Subject: [PATCH] Test release 1.5.1

---
 .travis.yml              | 43 +++++++++++++++++++++++++---------------
 CHANGELOG.rst            |  4 ++++
 build-and-push-docker.sh |  2 +-
 klaus/__init__.py        |  2 +-
 setup.py                 |  2 +-
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2326fb5d..7ee2b8f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,23 @@
+stages:
+  - test
+  - deploy
+
+
+# For tests
 os: linux
+addons:
+  apt:
+    packages:
+    - exuberant-ctags
 language: python
-services:
-  - docker
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
-addons:
-  apt:
-    packages:
-    - exuberant-ctags
-jobs:
-  include:
-    - python: 3.7
-      dist: xenial
-
+  - "3.7"
+  - "3.8"
+  - "nightly"
 install:
   - "pip install ."
   - "pip install -r test_requirements.txt"
@@ -23,8 +25,17 @@ script:
   - git config --global user.email "you@example.com"
   - git config --global user.name "Your Name"
   - ./runtests.sh
-deploy:
-  provider: script
-  on:
-    tags: true
-  script: ./build-and-push-docker.sh
+
+
+# For deploy
+services:
+  - docker
+jobs:
+  include:
+    - stage: deploy
+      script: skip
+      deploy:
+        on:
+          tags: true
+        provider: script
+        script: ./build-and-push-docker.sh
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 26221e4a..db210606 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.5.0 (Nov 26, 2019)
+-------------------
+- Test release to check Docker pipeline. No changes.
+
 1.5.0 (Nov 3, 2019)
 -------------------
 - #239: More robust "last updated at" determination (Jelmer Vernooij)
diff --git a/build-and-push-docker.sh b/build-and-push-docker.sh
index 718c6101..64100b3e 100755
--- a/build-and-push-docker.sh
+++ b/build-and-push-docker.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-docker build -t klaus:$TRAVIS_TAG --build-arg KLAUS_VERSION=$TRAVIS_TAG .
+docker build -t jonashaag/klaus:$TRAVIS_TAG --build-arg KLAUS_VERSION=$TRAVIS_TAG .
 echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
 docker push jonashaag/klaus:$TRAVIS_TAG
diff --git a/klaus/__init__.py b/klaus/__init__.py
index 28e6b601..aa93bff8 100644
--- a/klaus/__init__.py
+++ b/klaus/__init__.py
@@ -7,7 +7,7 @@
 from klaus.repo import FancyRepo, InvalidRepo
 
 
-KLAUS_VERSION = utils.guess_git_revision() or '1.5.0'
+KLAUS_VERSION = utils.guess_git_revision() or '1.5.1'
 
 
 class Klaus(flask.Flask):
diff --git a/setup.py b/setup.py
index 0f45110c..6091d00c 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ def install_data_files_hack():
 
 setup(
     name='klaus',
-    version='1.5.0',
+    version='1.5.1',
     author='Jonas Haag',
     author_email='jonas@lophus.org',
     packages=['klaus', 'klaus.contrib'],