Skip to content

Commit 40d9f06

Browse files
johnwasonLevi Armstrong
andauthored
Pr/rename python package (#16)
* Update to latest Tesseract with boost serialization * fixup * fixup * Update Python to upstream changes * Rename python package from "tesseract" to "tesseract_robotics" * Fix pkg_resources path in tesseract_viewer_python * Fix types renaming package Co-authored-by: Levi Armstrong <levi.armstrong@swri.org>
1 parent c79e54c commit 40d9f06

File tree

50 files changed

+124
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+124
-124
lines changed

tesseract_python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ tesseract_python_module(tesseract_time_parameterization_python SWIG_SRCS swig/te
128128
tesseract_python_module(tesseract_visualization_python SWIG_SRCS swig/tesseract_visualization_python.i PACKAGE tesseract_visualization LIBS tesseract::tesseract_visualization)
129129
tesseract_python_module(tesseract_process_managers_python SWIG_SRCS swig/tesseract_process_managers_python.i PACKAGE tesseract_process_managers LIBS tesseract::tesseract_process_managers )
130130

131-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/__package_init__.py.in ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract/__init__.py @ONLY)
131+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/__package_init__.py.in ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract_robotics/__init__.py @ONLY)
132132

133133
#install(CODE "MESSAGE(\"INSTALL TODO!\")")
134134

tesseract_python/cmake/setup.py.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ class BinaryDistribution(Distribution):
77
def has_ext_modules(foo):
88
return True
99

10-
setup(name='tesseract',
10+
setup(name='tesseract_robotics',
1111
version='@tesseract_python_version@',
1212
description='Tesseract Python Library',
1313
author='John Wason',
1414
author_email='wason@wasontech.com',
1515
url='http://robotraconteur.com/',
16-
packages=find_packages(include=['tesseract','tesseract.*']),
16+
packages=find_packages(include=['tesseract_robotics','tesseract_robotics.*']),
1717
package_data={'': ['*.pyd', '*.so']},
1818
distclass=BinaryDistribution,
1919
license='Apache-2.0',

tesseract_python/cmake/tesseract_python_module.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function(tesseract_python_module PY_MOD_NAME )
1313
endif()
1414
set_property(SOURCE ${PY_MOD_SWIG_SRC1} PROPERTY USE_LIBRARY_INCLUDE_DIRECTORIES TRUE)
1515

16-
set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract/${PY_MOD_PACKAGE})
16+
set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract_robotics/${PY_MOD_PACKAGE})
1717
set(SWIG_OUTFILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
1818

1919
swig_add_module(${PY_MOD_NAME} python ${PY_MOD_SWIG_SRCS})
@@ -36,16 +36,16 @@ function(tesseract_python_module PY_MOD_NAME )
3636
target_compile_definitions(${PY_MOD_REAL_NAME} PRIVATE -DSWIG_TYPE_TABLE=tesseract_python )
3737

3838
set_target_properties(${PY_MOD_REAL_NAME}
39-
PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract/${PY_MOD_PACKAGE})
39+
PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract_robotics/${PY_MOD_PACKAGE})
4040
set_target_properties(${PY_MOD_REAL_NAME}
41-
PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract/${PY_MOD_PACKAGE})
41+
PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract_robotics/${PY_MOD_PACKAGE})
4242
set_target_properties(${PY_MOD_REAL_NAME}
43-
PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract/${PY_MOD_PACKAGE})
43+
PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract_robotics/${PY_MOD_PACKAGE})
4444

4545
target_compile_options(${PY_MOD_REAL_NAME} PRIVATE ${TESSERACT_COMPILE_OPTIONS_PRIVATE})
4646
target_compile_options(${PY_MOD_REAL_NAME} PUBLIC ${TESSERACT_COMPILE_OPTIONS_PUBLIC})
4747
target_cxx_version(${PY_MOD_REAL_NAME} PUBLIC VERSION ${TESSERACT_CXX_VERSION})
4848

49-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/__init__.py.in ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract/${PY_MOD_PACKAGE}/__init__.py @ONLY)
49+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/__init__.py.in ${CMAKE_CURRENT_BINARY_DIR}/python/tesseract_robotics/${PY_MOD_PACKAGE}/__init__.py @ONLY)
5050

5151
endfunction()

tesseract_python/swig/tesseract_collision_bullet_python.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* limitations under the License.
2525
*/
2626

27-
%module(directors="1", package="tesseract.tesseract_collision_bullet") tesseract_collision_bullet_python
27+
%module(directors="1", package="tesseract_robotics.tesseract_collision_bullet") tesseract_collision_bullet_python
2828

2929
#pragma SWIG nowarn=473
3030

tesseract_python/swig/tesseract_collision_fcl_python.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* limitations under the License.
2525
*/
2626

27-
%module(directors="1", package="tesseract.tesseract_collision_fcl") tesseract_collision_fcl_python
27+
%module(directors="1", package="tesseract_robotics.tesseract_collision_fcl") tesseract_collision_fcl_python
2828

2929
#pragma SWIG nowarn=473
3030

tesseract_python/swig/tesseract_collision_python.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* limitations under the License.
2525
*/
2626

27-
%module(directors="1", package="tesseract.tesseract_collision") tesseract_collision_python
27+
%module(directors="1", package="tesseract_robotics.tesseract_collision") tesseract_collision_python
2828

2929
#pragma SWIG nowarn=473
3030

tesseract_python/swig/tesseract_command_language_python.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* limitations under the License.
2525
*/
2626

27-
%module(directors="1", package="tesseract.tesseract_command_language") tesseract_command_language_python
27+
%module(directors="1", package="tesseract_robotics.tesseract_command_language") tesseract_command_language_python
2828

2929
#pragma SWIG nowarn=473
3030

tesseract_python/swig/tesseract_common_python.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* limitations under the License.
2525
*/
2626

27-
%module(directors="1", package="tesseract.tesseract_common") tesseract_common_python
27+
%module(directors="1", package="tesseract_robotics.tesseract_common") tesseract_common_python
2828

2929
#pragma SWIG nowarn=473
3030

tesseract_python/swig/tesseract_environment_python.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* limitations under the License.
2525
*/
2626

27-
%module(directors="1", package="tesseract.tesseract_environment") tesseract_environment_python
27+
%module(directors="1", package="tesseract_robotics.tesseract_environment") tesseract_environment_python
2828

2929
#pragma SWIG nowarn=473
3030

tesseract_python/swig/tesseract_geometry_python.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* limitations under the License.
2525
*/
2626

27-
%module(directors="1", package="tesseract.tesseract_geometry") tesseract_geometry_python
27+
%module(directors="1", package="tesseract_robotics.tesseract_geometry") tesseract_geometry_python
2828

2929
#pragma SWIG nowarn=473
3030

0 commit comments

Comments
 (0)