python: fix python path setting in plain cmake workspaces #618
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The Travis CI build also fails without my patch! |
|
Yes, the travis file was just added recently and a PR exists to fix the failing unit test. The Python function to determine the folder name is obviously not in sync with the CMake equivalent: https://github.com/ros/catkin/blob/indigo-devel/cmake/python.cmake |
| @@ -241,7 +241,7 @@ def get_python_install_dir(): | |||
| python_use_debian_layout = os.path.exists('/etc/debian_version') | |||
| if os.name != 'nt': | |||
| python_version_xdoty = str(sys.version_info[0]) | |||
| if not python_use_debian_layout: | |||
| if (not python_use_debian_layout) or (sys.version_info[0] < 3) : | |||
| python_version_xdoty += '.' + str(sys.version_info[1]) | |||
There was a problem hiding this comment.
For better readability and in order to not diverge from the CMake implementation please change the lines 243-245 to:
python_version_xdoty = str(sys.version_info[0]) + '.' + str(sys.version_info[1]
if python_use_debian_layout and sys.version_info[0] == 3:
python_version_xdoty = str(sys.version_info[0])
In plain cmake workspaces the python install dir is set to lib/python2/dist-packages instead of lib/python2.7/dist-packages I checked the catkin/cmake/python.cmake file and in that file there is an extra check for the version, so I assume that we should only use the major version in case the major version is 3 or higher.
|
Done. |
|
Thx! |
dirk-thomas
added a commit
that referenced
this pull request
Apr 11, 2014
python: fix python path setting in plain cmake workspaces
cwecht
pushed a commit
to cwecht/catkin
that referenced
this pull request
Mar 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In plain cmake workspaces the python install dir is set to
lib/python2/dist-packages instead of lib/python2.7/dist-packages
I checked the catkin/cmake/python.cmake file and in that file there is
an extra check for the version, so I assume that we should only use
the major version in case the major version is 3 or higher.