diff --git a/.github/workflows/pip4linux.yml b/.github/workflows/pip4linux.yml index 5007d65b..95f21d78 100644 --- a/.github/workflows/pip4linux.yml +++ b/.github/workflows/pip4linux.yml @@ -16,12 +16,12 @@ jobs: fail-fast: false matrix: platform: [ubuntu-latest] - python-version: ["3.8", - "3.9", + python-version: ["3.9", "3.10", "3.11", "3.12", - "3.13",] + "3.13", + "3.14"] runs-on: ${{ matrix.platform }} @@ -37,9 +37,20 @@ jobs: - name: Update requirements run: | python -m pip install --upgrade pip - pip install pybind11 setuptools wheel twine + pip install pybind11 setuptools wheel twine auditwheel - name: Build and install for linux run: | cd python python setup.py bdist_wheel --plat-name manylinux2014_x86_64 + auditwheel repair dist/*.whl --wheel-dir auditwheel_dist + + - name: Upload to pypi when release + if: github.event_name == 'release' && github.event.action == 'published' + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_PYCGRAPH_TOKEN }} + run: | + cd python + twine check dist/* + twine upload --verbose --skip-existing dist/* diff --git a/.github/workflows/pip4mac.yml b/.github/workflows/pip4mac.yml index 0618829d..25f683d2 100644 --- a/.github/workflows/pip4mac.yml +++ b/.github/workflows/pip4mac.yml @@ -21,7 +21,8 @@ jobs: "3.10", "3.11", "3.12", - "3.13",] + "3.13", + "3.14"] runs-on: ${{ matrix.platform }} diff --git a/.github/workflows/pip4win.yml b/.github/workflows/pip4win.yml index 3ec2259b..77a5e7e0 100644 --- a/.github/workflows/pip4win.yml +++ b/.github/workflows/pip4win.yml @@ -21,7 +21,8 @@ jobs: "3.10", "3.11", "3.12", - "3.13"] + "3.13", + "3.14"] runs-on: ${{ matrix.platform }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 817a6b2b..9ebf41d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ message("* * * * * * * * * * * * * * * * * * * * * * * * * * * * *") cmake_minimum_required(VERSION 3.5.0) -project(CGraph VERSION 3.2.0) +project(CGraph VERSION 3.2.1) if(NOT DEFINED CMAKE_CXX_STANDARD) # CGraph默认使用C++11版本，推荐使用C++17版本。暂不支持C++11以下版本 diff --git a/COMPILE.md b/COMPILE.md index 9c7e0a1b..1b705792 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -80,10 +80,10 @@ --- ### Python 版本 -* MacOS 和 Windows 用户可以通过命令安装（推荐） +* 通过`pip`命令安装（推荐） ```shell - $ pip3 install PyCGraph # 直接通过 pip3 安装 - $ python3 -c "import PyCGraph" # 验证 PyCGraph 成功安装 + $ pip3 install pycgraph # 直接通过 pip3 安装 + $ python3 -c "import pycgraph" # 验证 pycgraph 成功安装 ``` * 通过源码安装(Linux/MacOS/Windows)，使用前需要提前安装`python3` `pybind11`和`setuptools` @@ -92,21 +92,21 @@ $ git clone https://github.com/ChunelFeng/CGraph.git $ cd CGraph/python # 进入对应文件夹 $ python3 setup.py bdist_wheel # 生成 *.whl 安装包 - $ pip3 install dist/PyCGraph-xxx.whl # 安装 *.whl 安装包，xxx 信息与版本和系统有关 - $ python3 tutorial/T00-HelloCGraph.py # 运行T00-HelloCGraph.py，并且在终端输出 Hello, PyCGraph. + $ pip3 install dist/pycgraph-xxx.whl # 安装 *.whl 安装包，xxx 信息与版本和系统有关 + $ python3 tutorial/T00-HelloCGraph.py # 运行T00-HelloCGraph.py，并且在终端输出 Hello, pycgraph. ``` * 本地直接安装 ```shell $ git clone https://github.com/ChunelFeng/CGraph.git $ cd CGraph/python # 进入对应文件夹 - $ python3 setup.py install # 安装 PyCGraph - $ python3 tutorial/T00-HelloCGraph.py # 运行T00-HelloCGraph.py，并且在终端输出 Hello, PyCGraph. + $ python3 setup.py install # 安装 pycgraph + $ python3 tutorial/T00-HelloCGraph.py # 运行T00-HelloCGraph.py，并且在终端输出 Hello, pycgraph. ``` * 通过uv安装(Linux/MacOS/Windows) ```shell $ uv init cgraph_env # 通过uv 创建一个名为 cgraph_env 的环境 $ cd cgraph_env - $ uv add "pycgraph @ git+https://github.com/ChunelFeng/CGraph.git@main#subdirectory=python" --marker "sys_platform == 'linux'" # 添加PyCGraph依赖 - $ python3 -c "import PyCGraph" # 验证 PyCGraph 成功安装 + $ uv add "pycgraph @ git+https://github.com/ChunelFeng/CGraph.git@main#subdirectory=python" --marker "sys_platform == 'linux'" # 添加 pycgraph 依赖 + $ python3 -c "import pycgraph" # 验证 pycgraph 成功安装 ``` diff --git a/README.md b/README.md index b31bbf5b..934418a4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ os stars forks - pypi + pypi PyPI Downloads CodeFactor

@@ -30,7 +30,7 @@ ![CGraph Skeleton](https://github.com/ChunelFeng/CGraph/blob/main/doc/image/CGraph%20Skeleton.jpg)
-本工程使用纯C++11标准库编写，无任何第三方依赖，兼容`MacOS`、`Linux`、`Windows`和`Android`系统。支持本地编译和二次开发，并且提供`Python`版本：`PyCGraph`。编译和安装方法，请参考 [CGraph 编译说明](https://github.com/ChunelFeng/CGraph/blob/main/COMPILE.md )
+本工程使用纯C++11标准库编写，无任何第三方依赖，兼容`MacOS`、`Linux`、`Windows`和`Android`系统。支持本地编译和二次开发，并且提供`Python`版本：`pycgraph`。编译和安装方法，请参考 [CGraph 编译说明](https://github.com/ChunelFeng/CGraph/blob/main/COMPILE.md )
详细功能介绍和用法，请参考 [一面之猿网](http://www.chunel.cn/) 中的文章内容。相关视频在B站持续更新中，欢迎观看和交流：
* [【B站视频】CGraph 入门篇](https://www.bilibili.com/video/BV1mk4y1v7XJ)
@@ -101,7 +101,7 @@ int main() { import time from datetime import datetime -from PyCGraph import GNode, GPipeline, CStatus +from pycgraph import GNode, GPipeline, CStatus class MyNode1(GNode): @@ -411,8 +411,9 @@ if __name__ == '__main__': * 优化 `message` 功能 * 优化 `aspect` 功能 -[2025.11.02 - v3.2.0 - Chunel] +[2025.11.08 - v3.2.1 - Chunel] * 提供 本地保存和加载 功能 +* 修改 `PyCGraph` 为 `pycgraph`，支持 `pip3 install pycgraph` 安装 diff --git a/README_en.md b/README_en.md index 72d25293..76a27615 100644 --- a/README_en.md +++ b/README_en.md @@ -3,7 +3,7 @@ os stars forks - pypi + pypi PyPI Downloads CodeFactor

diff --git a/python/PyCGraph.cpp b/python/PyCGraph.cpp index 16737757..cd4ad7e6 100644 --- a/python/PyCGraph.cpp +++ b/python/PyCGraph.cpp @@ -16,7 +16,7 @@ using namespace CGraph; namespace py = pybind11; -PYBIND11_MODULE(PyCGraph, cg) { +PYBIND11_MODULE(pycgraph, cg) { cg.doc() = "CGraph with python api, github: https://github.com/ChunelFeng/CGraph"; py::class_(cg, "UThreadPoolConfig") diff --git a/python/PyCGraph-run-tutorials.sh b/python/pycgraph-run-tutorials.sh similarity index 84% rename from python/PyCGraph-run-tutorials.sh rename to python/pycgraph-run-tutorials.sh index 75e1a344..f7b7feb5 100755 --- a/python/PyCGraph-run-tutorials.sh +++ b/python/pycgraph-run-tutorials.sh @@ -13,4 +13,4 @@ for file in *.py; do echo " " done -echo -e "\033[34m congratulations, automatic run PyCGraph tutorials finish... \033[0m" +echo -e "\033[34m congratulations, automatic run pycgraph tutorials finish... \033[0m" diff --git a/python/pyproject.toml b/python/pyproject.toml index f9c4b99e..a9341519 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools", "wheel", "pybind11"] build-backend = "setuptools.build_meta" [project] -name = "PyCGraph" +name = "pycgraph" dynamic = ["version", "description", "authors", "license", "readme", "requires-python", "keywords", "classifiers"] dependencies = [ diff --git a/python/setup.py b/python/setup.py index 6591d228..f331cba3 100644 --- a/python/setup.py +++ b/python/setup.py @@ -10,8 +10,8 @@ from setuptools import setup, Extension import pybind11 -__PYCGRAPH_NAME__ = "PyCGraph" -__PYCGRAPH_VERSION__ = "3.2.0" +__PYCGRAPH_NAME__ = "pycgraph" +__PYCGRAPH_VERSION__ = "3.2.1" __PYCGRAPH_AUTHOR__ = "Chunel" __PYCGRAPH_AUTHOR_EMAIL__ = "chunel@foxmail.com" __PYCGRAPH_DESCRIPTION__ = "CGraph with python api wrapper by pybind11" diff --git a/python/tutorial/MyGAspect/MyConnApsect.py b/python/tutorial/MyGAspect/MyConnApsect.py index 6debb480..f876bbcd 100644 --- a/python/tutorial/MyGAspect/MyConnApsect.py +++ b/python/tutorial/MyGAspect/MyConnApsect.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GAspect, CStatus +from pycgraph import GAspect, CStatus class MyConnAspect(GAspect): def __init__(self, ip: str, port: int): diff --git a/python/tutorial/MyGAspect/MyTimerAspect.py b/python/tutorial/MyGAspect/MyTimerAspect.py index 20492be1..bf7783e3 100644 --- a/python/tutorial/MyGAspect/MyTimerAspect.py +++ b/python/tutorial/MyGAspect/MyTimerAspect.py @@ -8,7 +8,7 @@ import time -from PyCGraph import GAspect, CStatus +from pycgraph import GAspect, CStatus class MyTimerAspect(GAspect): _start_time = None diff --git a/python/tutorial/MyGCondition/MyCondition.py b/python/tutorial/MyGCondition/MyCondition.py index 57aacedd..a5239771 100644 --- a/python/tutorial/MyGCondition/MyCondition.py +++ b/python/tutorial/MyGCondition/MyCondition.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GCondition +from pycgraph import GCondition class MyCondition(GCondition): def choose(self): diff --git a/python/tutorial/MyGCondition/MyParamCondition.py b/python/tutorial/MyGCondition/MyParamCondition.py index 41d15f29..24b46c35 100644 --- a/python/tutorial/MyGCondition/MyParamCondition.py +++ b/python/tutorial/MyGCondition/MyParamCondition.py @@ -7,7 +7,7 @@ """ -from PyCGraph import GCondition, GElementRelation +from pycgraph import GCondition, GElementRelation from MyParams.MyParam import MyParam diff --git a/python/tutorial/MyGDaemon/MyMonitorDaemon.py b/python/tutorial/MyGDaemon/MyMonitorDaemon.py index d01e5402..c2a027fa 100644 --- a/python/tutorial/MyGDaemon/MyMonitorDaemon.py +++ b/python/tutorial/MyGDaemon/MyMonitorDaemon.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GDaemon +from pycgraph import GDaemon from MyParams.MyParam import MyParam diff --git a/python/tutorial/MyGEvent/MyPrintEvent.py b/python/tutorial/MyGEvent/MyPrintEvent.py index bb0e21c2..baa6d0e0 100644 --- a/python/tutorial/MyGEvent/MyPrintEvent.py +++ b/python/tutorial/MyGEvent/MyPrintEvent.py @@ -8,7 +8,7 @@ import time -from PyCGraph import GEvent +from pycgraph import GEvent class MyPrintEvent(GEvent): _times: int = 0 diff --git a/python/tutorial/MyGMutable/MyMutable.py b/python/tutorial/MyGMutable/MyMutable.py index 72d4d35e..58f1a263 100644 --- a/python/tutorial/MyGMutable/MyMutable.py +++ b/python/tutorial/MyGMutable/MyMutable.py @@ -8,7 +8,7 @@ from typing import List -from PyCGraph import GMutable, CStatus, GElement +from pycgraph import GMutable, CStatus, GElement from MyParams.MyParam import MyParam diff --git a/python/tutorial/MyGNode/HelloCGraphNode.py b/python/tutorial/MyGNode/HelloCGraphNode.py index 6767bc5a..c8e7541e 100644 --- a/python/tutorial/MyGNode/HelloCGraphNode.py +++ b/python/tutorial/MyGNode/HelloCGraphNode.py @@ -6,9 +6,9 @@ @Desc: """ -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus class HelloCGraphNode(GNode): def run(self): - print("Hello, PyCGraph.") + print("Hello, pycgraph.") return CStatus() diff --git a/python/tutorial/MyGNode/MyEventNode.py b/python/tutorial/MyGNode/MyEventNode.py index 70e74951..b6c2ed4b 100644 --- a/python/tutorial/MyGNode/MyEventNode.py +++ b/python/tutorial/MyGNode/MyEventNode.py @@ -8,7 +8,7 @@ from datetime import datetime -from PyCGraph import GNode, CStatus, GEventType +from pycgraph import GNode, CStatus, GEventType class MyEventNode(GNode): def run(self): diff --git a/python/tutorial/MyGNode/MyHoldNode.py b/python/tutorial/MyGNode/MyHoldNode.py index 6b9aa45a..68f94404 100644 --- a/python/tutorial/MyGNode/MyHoldNode.py +++ b/python/tutorial/MyGNode/MyHoldNode.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus from MyParams.MyParam import MyParam diff --git a/python/tutorial/MyGNode/MyMatchNode.py b/python/tutorial/MyGNode/MyMatchNode.py index a586560f..861bd3de 100644 --- a/python/tutorial/MyGNode/MyMatchNode.py +++ b/python/tutorial/MyGNode/MyMatchNode.py @@ -9,7 +9,7 @@ import time from datetime import datetime -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus from MyParams.MyParam import MyParam diff --git a/python/tutorial/MyGNode/MyNode1.py b/python/tutorial/MyGNode/MyNode1.py index 74805229..5373c6fc 100644 --- a/python/tutorial/MyGNode/MyNode1.py +++ b/python/tutorial/MyGNode/MyNode1.py @@ -9,7 +9,7 @@ from datetime import datetime import time -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus class MyNode1(GNode): def run(self): diff --git a/python/tutorial/MyGNode/MyNode2.py b/python/tutorial/MyGNode/MyNode2.py index c8e475a4..7b30834a 100644 --- a/python/tutorial/MyGNode/MyNode2.py +++ b/python/tutorial/MyGNode/MyNode2.py @@ -9,7 +9,7 @@ from datetime import datetime import time -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus class MyNode2(GNode): def init(self): diff --git a/python/tutorial/MyGNode/MyReadParamNode.py b/python/tutorial/MyGNode/MyReadParamNode.py index ec0a6bba..cc313c93 100644 --- a/python/tutorial/MyGNode/MyReadParamNode.py +++ b/python/tutorial/MyGNode/MyReadParamNode.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus from MyParams.MyParam import MyParam diff --git a/python/tutorial/MyGNode/MyStageNode.py b/python/tutorial/MyGNode/MyStageNode.py index 3dace430..5e785c64 100644 --- a/python/tutorial/MyGNode/MyStageNode.py +++ b/python/tutorial/MyGNode/MyStageNode.py @@ -9,7 +9,8 @@ import time from datetime import datetime -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus + class MyStageNode(GNode): def __init__(self, before: int, after: int): diff --git a/python/tutorial/MyGNode/MyTemplateNode.py b/python/tutorial/MyGNode/MyTemplateNode.py index be60bc35..5e1a8923 100644 --- a/python/tutorial/MyGNode/MyTemplateNode.py +++ b/python/tutorial/MyGNode/MyTemplateNode.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus class MyTemplateNode(GNode): diff --git a/python/tutorial/MyGNode/MyWriteParamNode.py b/python/tutorial/MyGNode/MyWriteParamNode.py index c0568cbf..f4fae1ed 100644 --- a/python/tutorial/MyGNode/MyWriteParamNode.py +++ b/python/tutorial/MyGNode/MyWriteParamNode.py @@ -6,8 +6,7 @@ @Desc: """ - -from PyCGraph import GNode, CStatus +from pycgraph import GNode, CStatus from MyParams.MyParam import MyParam diff --git a/python/tutorial/MyParams/MyParam.py b/python/tutorial/MyParams/MyParam.py index 38b08257..64a94051 100644 --- a/python/tutorial/MyParams/MyParam.py +++ b/python/tutorial/MyParams/MyParam.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GParam, CStatus +from pycgraph import GParam, CStatus class MyParam(GParam): value = 0 diff --git a/python/tutorial/T00-HelloCGraph.py b/python/tutorial/T00-HelloCGraph.py index f68e13d5..e0708512 100644 --- a/python/tutorial/T00-HelloCGraph.py +++ b/python/tutorial/T00-HelloCGraph.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.HelloCGraphNode import HelloCGraphNode diff --git a/python/tutorial/T01-Simple.py b/python/tutorial/T01-Simple.py index 68e6bdff..6c84ec6e 100644 --- a/python/tutorial/T01-Simple.py +++ b/python/tutorial/T01-Simple.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, CStatus +from pycgraph import GPipeline, CStatus from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T02-Cluster.py b/python/tutorial/T02-Cluster.py index 905748b9..1da7c984 100644 --- a/python/tutorial/T02-Cluster.py +++ b/python/tutorial/T02-Cluster.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, GCluster +from pycgraph import GPipeline, GCluster from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T03-Region.py b/python/tutorial/T03-Region.py index 014d84cf..e3cb8095 100644 --- a/python/tutorial/T03-Region.py +++ b/python/tutorial/T03-Region.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, GRegion +from pycgraph import GPipeline, GRegion from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T04-Complex.py b/python/tutorial/T04-Complex.py index 82b31e1d..72fbbc9c 100644 --- a/python/tutorial/T04-Complex.py +++ b/python/tutorial/T04-Complex.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, GCluster, GRegion +from pycgraph import GPipeline, GCluster, GRegion from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T05-Param.py b/python/tutorial/T05-Param.py index ec00a564..493ac058 100644 --- a/python/tutorial/T05-Param.py +++ b/python/tutorial/T05-Param.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GNode, GPipeline +from pycgraph import GNode, GPipeline from MyGNode.MyWriteParamNode import MyWriteParamNode from MyGNode.MyReadParamNode import MyReadParamNode diff --git a/python/tutorial/T06-Condition.py b/python/tutorial/T06-Condition.py index f8bc58a4..12f8ceea 100644 --- a/python/tutorial/T06-Condition.py +++ b/python/tutorial/T06-Condition.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T07-MultiPipeline.py b/python/tutorial/T07-MultiPipeline.py index 56abe5e8..e495df7a 100644 --- a/python/tutorial/T07-MultiPipeline.py +++ b/python/tutorial/T07-MultiPipeline.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, UThreadPoolConfig, UThreadPool +from pycgraph import GPipeline, UThreadPoolConfig, UThreadPool from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T08-Template.py b/python/tutorial/T08-Template.py index 522bb160..41f9083f 100644 --- a/python/tutorial/T08-Template.py +++ b/python/tutorial/T08-Template.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyNode1 import MyNode1 from MyGNode.MyTemplateNode import MyTemplateNode diff --git a/python/tutorial/T09-Aspect.py b/python/tutorial/T09-Aspect.py index deec5a16..691bcdf0 100644 --- a/python/tutorial/T09-Aspect.py +++ b/python/tutorial/T09-Aspect.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, GCluster +from pycgraph import GPipeline, GCluster from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T10-AspectParam.py b/python/tutorial/T10-AspectParam.py index bc9fccb6..59da78f6 100644 --- a/python/tutorial/T10-AspectParam.py +++ b/python/tutorial/T10-AspectParam.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T12-Function.py b/python/tutorial/T12-Function.py index 3cd670bc..ce4f22ac 100644 --- a/python/tutorial/T12-Function.py +++ b/python/tutorial/T12-Function.py @@ -8,7 +8,7 @@ import time -from PyCGraph import GPipeline, GFunction, CFunctionType, CStatus +from pycgraph import GPipeline, GFunction, CFunctionType, CStatus from MyGNode.MyNode1 import MyNode1 from MyGNode.MyWriteParamNode import MyWriteParamNode diff --git a/python/tutorial/T13-Daemon.py b/python/tutorial/T13-Daemon.py index d81beff9..b07524c8 100644 --- a/python/tutorial/T13-Daemon.py +++ b/python/tutorial/T13-Daemon.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyNode1 import MyNode1 from MyGNode.MyWriteParamNode import MyWriteParamNode diff --git a/python/tutorial/T14-Hold.py b/python/tutorial/T14-Hold.py index 313607c1..8523de76 100644 --- a/python/tutorial/T14-Hold.py +++ b/python/tutorial/T14-Hold.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyHoldNode import MyHoldNode from MyGNode.MyNode1 import MyNode1 diff --git a/python/tutorial/T18-Event.py b/python/tutorial/T18-Event.py index e4c02eab..64951580 100644 --- a/python/tutorial/T18-Event.py +++ b/python/tutorial/T18-Event.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyNode1 import MyNode1 from MyGNode.MyEventNode import MyEventNode diff --git a/python/tutorial/T19-Cancel.py b/python/tutorial/T19-Cancel.py index 208fe02d..03143ad0 100644 --- a/python/tutorial/T19-Cancel.py +++ b/python/tutorial/T19-Cancel.py @@ -8,7 +8,7 @@ import time -from PyCGraph import GPipeline, StdFutureCStatus +from pycgraph import GPipeline, StdFutureCStatus from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T20-Suspend.py b/python/tutorial/T20-Suspend.py index e0ae5d9f..41f5414f 100644 --- a/python/tutorial/T20-Suspend.py +++ b/python/tutorial/T20-Suspend.py @@ -8,7 +8,7 @@ import time -from PyCGraph import GPipeline, StdFutureCStatus +from pycgraph import GPipeline, StdFutureCStatus from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T21-MultiCondition.py b/python/tutorial/T21-MultiCondition.py index 23f4f78d..820349ea 100644 --- a/python/tutorial/T21-MultiCondition.py +++ b/python/tutorial/T21-MultiCondition.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, GSerialMultiCondition, GParallelMultiCondition +from pycgraph import GPipeline, GSerialMultiCondition, GParallelMultiCondition from MyGNode.MyMatchNode import MyMatchNode from MyGNode.MyNode1 import MyNode1 diff --git a/python/tutorial/T22-Timeout.py b/python/tutorial/T22-Timeout.py index b8c44fc4..a52aae66 100644 --- a/python/tutorial/T22-Timeout.py +++ b/python/tutorial/T22-Timeout.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, CStatus +from pycgraph import GPipeline, CStatus from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T24-Fence.py b/python/tutorial/T24-Fence.py index e55bc000..e35f4ed1 100644 --- a/python/tutorial/T24-Fence.py +++ b/python/tutorial/T24-Fence.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, GFence, GElementTimeoutStrategy +from pycgraph import GPipeline, GFence, GElementTimeoutStrategy from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T26-Mutable.py b/python/tutorial/T26-Mutable.py index 4a86921a..97a75c95 100644 --- a/python/tutorial/T26-Mutable.py +++ b/python/tutorial/T26-Mutable.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyNode1 import MyNode1 from MyGNode.MyWriteParamNode import MyWriteParamNode diff --git a/python/tutorial/T27-Trim.py b/python/tutorial/T27-Trim.py index cf2810e9..bbb57275 100644 --- a/python/tutorial/T27-Trim.py +++ b/python/tutorial/T27-Trim.py @@ -7,7 +7,7 @@ """ -from PyCGraph import GPipeline +from pycgraph import GPipeline from MyGNode.MyNode1 import MyNode1 from MyGNode.MyNode2 import MyNode2 diff --git a/python/tutorial/T28-Stage.py b/python/tutorial/T28-Stage.py index d8b5b38f..c506049d 100644 --- a/python/tutorial/T28-Stage.py +++ b/python/tutorial/T28-Stage.py @@ -6,7 +6,7 @@ @Desc: """ -from PyCGraph import GPipeline, GStage +from pycgraph import GPipeline, GStage from MyGNode.MyNode1 import MyNode1 from MyGNode.MyStageNode import MyStageNode diff --git a/xmake.lua b/xmake.lua index dc05ec7b..63d1933a 100644 --- a/xmake.lua +++ b/xmake.lua @@ -2,7 +2,7 @@ set_project("CGraph") -- set project version -set_version("3.2.0") +set_version("3.2.1") -- set language: c++11 set_languages("c++11")