# HG changeset patch # User Franz Glasner # Date 1557473767 -7200 # Node ID 90dd0d04b9268590a487f7b20a15da077973aff2 # Parent 51a355095838fe2ff345ddf3e28f5ce92ab55c07 +++++ v0.7.1 diff -r 51a355095838 -r 90dd0d04b926 CHANGES.txt --- a/CHANGES.txt Thu May 09 12:25:28 2019 +0200 +++ b/CHANGES.txt Fri May 10 09:36:07 2019 +0200 @@ -13,8 +13,8 @@ -------------- .. changelog:: - :version: 0.7.1.dev1 - :released: unreleased + :version: 0.7.1 + :released: 2019-05-10 .. change:: :tags: feature diff -r 51a355095838 -r 90dd0d04b926 README.txt --- a/README.txt Thu May 09 12:25:28 2019 +0200 +++ b/README.txt Fri May 10 09:36:07 2019 +0200 @@ -3,7 +3,7 @@ .. _README: :Author: Franz Glasner -:Version: 0.7.1.dev1 +:Version: 0.7.1 :Date: |VCSJustDate| :Copyright: (c) 2015–2019, Franz Glasner. All rights reserved. diff -r 51a355095838 -r 90dd0d04b926 configmix/__init__.py --- a/configmix/__init__.py Thu May 09 12:25:28 2019 +0200 +++ b/configmix/__init__.py Fri May 10 09:36:07 2019 +0200 @@ -13,7 +13,7 @@ from __future__ import division, print_function, absolute_import -__version__ = "0.7.1.dev1" +__version__ = "0.7.1" __revision__ = "|VCSRevision|" __date__ = "|VCSJustDate|" @@ -90,7 +90,7 @@ for f in files: ex = safe_merge(_load_cfg_from_file(f), ex) if extras: - ex = safe_merge(Configuration(extras), ex) + ex = safe_merge(Configuration(extras), ex) return Configuration(ex)