diff --git a/aksetup_helper.py b/aksetup_helper.py index 6335e1046f2f7fc55c6e2f8446a67db7869b62f4..12d888c984c1f931aa26353cab0e9b68ce4bb3a0 100644 --- a/aksetup_helper.py +++ b/aksetup_helper.py @@ -723,7 +723,7 @@ def _run_git_command(cmd): print("Hit Ctrl-C now if you'd like to think about the situation.") print(DASH_SEPARATOR) count_down_delay(delay=5) - return stdout.decode("ascii"), git_error + return stdout.decode("utf-8"), git_error def check_git_submodules(): diff --git a/pyopencl/compyte b/pyopencl/compyte index f8182c1ae347abd4298d6c26390215845b31c09e..c5e80622ee2dfd129d56886098a5ad532c54cf09 160000 --- a/pyopencl/compyte +++ b/pyopencl/compyte @@ -1 +1 @@ -Subproject commit f8182c1ae347abd4298d6c26390215845b31c09e +Subproject commit c5e80622ee2dfd129d56886098a5ad532c54cf09 diff --git a/setup.py b/setup.py index 26fb709b43c3471ddf242878fbf42ea3f8f71299..8f6331214c46d009f1f7118124461c867ba762e2 100644 --- a/setup.py +++ b/setup.py @@ -219,7 +219,7 @@ def main(): packages=["pyopencl", "pyopencl.characterize", "pyopencl.compyte"], install_requires=[ - "pytools>=2013.5.2", + "pytools>=2014.2", "pytest>=2", "decorator>=3.2.0", "cffi>=0.7.2",