Merge pull request #71 from liufang-robot/master

feat: lebai python to pylebai
lebai-robotics · Jun 3, 2024 · c2ec71e · c2ec71e
2 parents 722e98f + be54c0b
commit c2ec71e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compile command" TRUE)
 
 
-project(lebai VERSION 1.1.17 LANGUAGES CXX)
+project(lebai VERSION 1.1.18 LANGUAGES CXX)
 set(PROJECT_NAMESPACE lebai)
 message(STATUS "${PROJECT_NAME} version: ${PROJECT_VERSION}")
 # message(STATUS "major: ${PROJECT_VERSION_MAJOR}")

diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "lebai sdk"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.17
+PROJECT_NUMBER         = 1.1.18
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/cmake/python.cmake b/cmake/python.cmake
@@ -100,7 +100,7 @@ function(search_python_internal_module)
   endif()
 endfunction()
 
-set(PYTHON_PROJECT lebai)
+set(PYTHON_PROJECT pylebai)
 set(PYTHON_PROJECT_DIR ${PROJECT_BINARY_DIR}/python/${PYTHON_PROJECT})
 message(STATUS "Python project build path: ${PYTHON_PROJECT_DIR}")
 

diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 1.1.18
+
+调整python包名字为pylebai。
+
 ## 1.1.17
 
 修正python不能捕获异常的问题。

diff --git a/doc/python.md b/doc/python.md
@@ -24,7 +24,7 @@ cmake --build build --target python_package
 构建完成后，在`build/python/dist/`目录下会生成python的whl包，可以直接使用pip进行安装。
 
 ```bash
-pip3 install build/python/dist/pylebai-xxx.whl
+pip3 install build/python/dist/pypylebai-xxx.whl
 ```
 
 您可以通过如下命令来查看安装的包的信息。
@@ -44,7 +44,7 @@ sudo pip3 uninstall pylebai
 安装完成后可以直接使用lebai包。
 
 ```python
-from lebai import l_master
+from pylebai import l_master
 robot = l_master.Robot("172.17.0.5",True)
 robot.movej({"j1": 1.0,"j2": -1.0471975511965976,"j3": 1.3962634015954636,"j4": -0.17453292519943295,"j5": -1.0471975511965976,"j6": 0.0},1.0,1.0,0.0,0.0)
 ```

diff --git a/examples/example.py b/examples/example.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from lebai import zeroconf
+from pylebai import zeroconf
 ## Try to find the l_master
 d = zeroconf.Discovery()
 controllers = d.resolve()
 ## Robot instance
-from lebai import l_master
+from pylebai import l_master
 import time
 robot = l_master.Robot(controllers[0].ip_address)
 time.sleep(2)