Skip to content

Commit

Permalink
Test release 1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Haag committed Nov 26, 2019
1 parent df2fd66 commit 5bbbd0e
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 19 deletions.
43 changes: 27 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,41 @@
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"
script:
- git config --global user.email "[email protected]"
- 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
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion build-and-push-docker.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion klaus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='[email protected]',
packages=['klaus', 'klaus.contrib'],
Expand Down

0 comments on commit 5bbbd0e

Please sign in to comment.