From 8895ae218d8518642554e1916c6ec71641d9bd4c Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Tue, 9 Jun 2020 15:47:58 +0200 Subject: [PATCH 1/3] add cmake files to setup.py to install them --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 88733e7f..6d0bcdee 100644 --- a/setup.py +++ b/setup.py @@ -109,6 +109,8 @@ def run(self): packages=find_packages(exclude=['tests*', 'docs']), package_data={ 'catkin_tools': [ + 'jobs/cmake/python.cmake', + 'jobs/cmake/python_install_dir.cmake', 'notifications/resources/linux/catkin_icon.png', 'notifications/resources/linux/catkin_icon_red.png', 'verbs/catkin_shell_verbs.bash', From 24c0bd1fce4d90bb1eaa7c946f15ae54883d9760 Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Tue, 9 Jun 2020 15:49:08 +0200 Subject: [PATCH 2/3] do not run tests on development installation --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 506c910f..38af3211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_install: - pip install setuptools argparse catkin-pkg PyYAML psutil osrf_pycommon pyenchant sphinxcontrib-spelling install: # Install catkin_tools - - python setup.py develop + - python setup.py install before_script: # Install catkin_tools test harness dependencies - ./.travis.before_script.bash From 0955e754cff6faeb470535f12a92bf06dd1979f9 Mon Sep 17 00:00:00 2001 From: Guglielmo Gemignani <2789215+g-gemignani@users.noreply.github.com> Date: Mon, 17 Aug 2020 20:01:43 +0200 Subject: [PATCH 3/3] Fix byte decoding for python 3 (Issue #625) (#627) --- catkin_tools/common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/catkin_tools/common.py b/catkin_tools/common.py index ca49f60f..2dd4b9b7 100644 --- a/catkin_tools/common.py +++ b/catkin_tools/common.py @@ -28,7 +28,10 @@ _cmd_split(u'\u00E9') def cmd_split(s): - return _cmd_split(s.decode('utf-8')) + if sys.version_info.major == 3: + return _cmd_split(str(s, 'utf-8')) + else: + return _cmd_split(s.decode('utf-8')) except UnicodeEncodeError: cmd_split = _cmd_split