Skip to content

Commit

Permalink
Fix a bytes/str bug in dodo.py
Browse files Browse the repository at this point in the history
  • Loading branch information
kurtmckee committed Jul 13, 2020
1 parent 944361f commit 92660e9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
=====

Expand Down
2 changes: 1 addition & 1 deletion dodo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion pelican_precompress.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down

0 comments on commit 92660e9

Please sign in to comment.