From 92660e9141b95a29de33266c14cb9c2b9b33ba78 Mon Sep 17 00:00:00 2001 From: Kurt McKee Date: Mon, 13 Jul 2020 10:38:00 -0500 Subject: [PATCH] Fix a bytes/str bug in dodo.py --- CHANGES.rst | 9 +++++++++ dodo.py | 2 +- pelican_precompress.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 275f327..4b8b5ea 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,15 @@ Unreleased changes +1.1.1 +===== + +*Released 13 July 2020* + +* Fix a bytes/str oversight in the release process. + + + 1.1.0 ===== diff --git a/dodo.py b/dodo.py index 3aee915..fa663e8 100644 --- a/dodo.py +++ b/dodo.py @@ -67,7 +67,7 @@ def validate_in_git_master_branch(): """Validate that the repository is in the git master branch.""" branch = subprocess.check_output('git rev-parse --abbrev-ref HEAD', shell=True) - return branch.strip() == 'master' + return branch.decode('utf8', errors='ignore').strip() == 'master' def task_release(): diff --git a/pelican_precompress.py b/pelican_precompress.py index f3c4c7d..ea633d5 100644 --- a/pelican_precompress.py +++ b/pelican_precompress.py @@ -10,7 +10,7 @@ from typing import Dict, Iterable, Optional, Set, Union import zlib -__version__ = '1.1.0' +__version__ = '1.1.1' log = logging.getLogger(__name__)