Skip to content

Commit

Permalink
Merge branch '0.6.x' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
remram44 committed Mar 16, 2015
2 parents 370ca8a + db4782f commit 5b35db0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Changelog
=========

0.6.2 (???)
-----------
0.6.2 (2015-03-16)
------------------

Bugfixes:
* Fixes installation on Python 3 with 7-bit locale
Expand Down
4 changes: 3 additions & 1 deletion reprounzip/setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import io
import os
from setuptools import setup
import sys
Expand All @@ -7,7 +8,8 @@
os.chdir(os.path.abspath(os.path.dirname(__file__)))


with open('README.rst') as fp:
# Need to specify encoding for PY3, which has the worse unicode handling ever
with io.open('README.rst', encoding='utf-8') as fp:
description = fp.read()
req = [
'PyYAML',
Expand Down
2 changes: 1 addition & 1 deletion reprozip/reprozip/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# This file is part of ReproZip which is released under the Revised BSD License
# See file LICENSE for full license details.

__version__ = '0.6.1'
__version__ = '0.6.2'
2 changes: 1 addition & 1 deletion reprozip/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
if sys.version_info < (2, 7):
req.append('argparse')
setup(name='reprozip',
version='0.6.1',
version='0.6.2',
ext_modules=[pytracer],
packages=['reprozip', 'reprozip.tracer'],
entry_points={'console_scripts': [
Expand Down

0 comments on commit 5b35db0

Please sign in to comment.