Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/pip4mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
push:
branches:
- main
release:
types:
- published

jobs:
build:
Expand Down Expand Up @@ -42,7 +45,7 @@ jobs:
python setup.py build
python setup.py bdist_wheel

- name: Upload to pypi if release
- name: Upload to pypi when release
if: github.event_name == 'release' && github.event.action == 'published'
env:
TWINE_USERNAME: __token__
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/pip4win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
push:
branches:
- main
release:
types:
- published

jobs:
build:
Expand Down Expand Up @@ -44,7 +47,7 @@ jobs:
python setup.py build
python setup.py bdist_wheel

- name: Upload to pypi if release
- name: Upload to pypi when release
if: github.event_name == 'release' && github.event.action == 'published'
env:
TWINE_USERNAME: __token__
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ message("* * * * * * * * * * * * * * * * * * * * * * * * * * * * *")

cmake_minimum_required(VERSION 3.5.0)

project(CGraph VERSION 3.0.0)
project(CGraph VERSION 3.1.0)

# CGraph默认使用C++11版本,推荐使用C++17版本。暂不支持C++11以下版本
set(CMAKE_CXX_STANDARD 11)
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
###############################################################################
bazel_dep(name = "rules_cc", version = "0.0.1")
bazel_dep(name = "platforms", version = "0.0.8")
bazel_dep(name = "platforms", version = "0.0.8")
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<a href="https://github.com/ChunelFeng/CGraph"><img src="https://badgen.net/badge/os/MacOS,Linux,Windows/cyan?list=1" alt="os"></a>
<a href="https://github.com/ChunelFeng/CGraph/stargazers"><img src="https://badgen.net/github/stars/ChunelFeng/CGraph?color=cyan" alt="stars"></a>
<a href="https://github.com/ChunelFeng/CGraph/network/members"><img src="https://badgen.net/github/forks/ChunelFeng/CGraph?color=cyan" alt="forks"></a>
<a href="https://badge.fury.io/py/PyCGraph"><img src="https://badge.fury.io/py/PyCGraph.svg" alt="pypi"></a>
<a href="https://www.codefactor.io/repository/github/chunelfeng/cgraph/overview/main"><img src="https://www.codefactor.io/repository/github/chunelfeng/cgraph/badge/main" alt="CodeFactor" /></a>
</p>

Expand Down Expand Up @@ -387,8 +388,9 @@ if __name__ == '__main__':
* 更新`tutorial`内容

[2025.05.04 - v3.1.0 - Chunel]
* 完善 Python 版本功能
* 提供 Python 打包功能,MacOS 和 Windows 用户可以通过 `pip3 install PyCGraph` 安装
* 提供全量功能 Python 版本
* 提供 Python 和 C++ 混合编程功能
* 提供 Python 打包功能,支持 `pip3 install PyCGraph` 安装

</details>

Expand All @@ -397,7 +399,6 @@ if __name__ == '__main__':
<summary><b>附录-2. 感谢</b></summary>

* 感谢 [Doocs 微信公众号](https://mp.weixin.qq.com/mp/appmsgalbum?__biz=MzIxNjA5ODQ0OQ==&action=getalbum&album_id=1989460124624551937&scene=173&from_msgid=2654703194&from_itemidx=1&count=3&nolastread=1#wechat_redirect) 刊登相关介绍文档,欢迎加入 [Doocs 开源社区](https://github.com/doocs)

* 感谢《HelloGithub》期刊介绍和推荐:[HelloGithub 第70期](https://github.com/521xueweihan/HelloGitHub/blob/master/content/HelloGitHub70.md)

<p align="center"><img src="https://github.com/ChunelFeng/CGraph/blob/main/doc/image/HelloGithub%20Logo.gif"/></p>
Expand Down
4 changes: 3 additions & 1 deletion README_en.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<p align="left">
<a href="https://github.com/ChunelFeng/CGraph"><img src="https://badgen.net/badge/langs/C++/cyan?list=1" alt="languages"></a>
<a href="https://github.com/ChunelFeng/CGraph"><img src="https://badgen.net/badge/langs/C++,Python/cyan?list=1" alt="languages"></a>
<a href="https://github.com/ChunelFeng/CGraph"><img src="https://badgen.net/badge/os/MacOS,Linux,Windows/cyan?list=1" alt="os"></a>
<a href="https://github.com/ChunelFeng/CGraph/stargazers"><img src="https://badgen.net/github/stars/ChunelFeng/CGraph?color=cyan" alt="stars"></a>
<a href="https://github.com/ChunelFeng/CGraph/network/members"><img src="https://badgen.net/github/forks/ChunelFeng/CGraph?color=cyan" alt="forks"></a>
<a href="https://badge.fury.io/py/PyCGraph"><img src="https://badge.fury.io/py/PyCGraph.svg" alt="pypi"></a>
<a href="https://www.codefactor.io/repository/github/chunelfeng/cgraph/overview/main"><img src="https://www.codefactor.io/repository/github/chunelfeng/cgraph/badge/main" alt="CodeFactor" /></a>
</p>

[![awesome-cpp](https://badgen.net/badge/icon/awesome-cpp/purple?icon=awesome&label&color)](https://github.com/fffaraz/awesome-cpp)
Expand Down
11 changes: 9 additions & 2 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@
import pybind11

__PYCGRAPH_NAME__ = "PyCGraph"
__PYCGRAPH_VERSION__ = "0.0.3"
__PYCGRAPH_VERSION__ = "3.1.0"
__PYCGRAPH_AUTHOR__ = "Chunel"
__PYCGRAPH_AUTHOR_EMAIL__ = "chunel@foxmail.com"
__PYCGRAPH_DESCRIPTION__ = "CGraph with python api wrapper by pybind11"
__PYCGRAPH_URL__ = "https://github.com/ChunelFeng/CGraph"
__PYCGRAPH_LICENSE__ = "MIT"
__PYCGRAPH_LONG_DESCRIPTION__ = 'You can get everything in CGraph github main page : [CGraph](https://github.com/ChunelFeng/CGraph)'
__PYCGRAPH_KEYWORDS__ = ["CGraph", __PYCGRAPH_NAME__, "dag", "parallel", 'workflow', 'taskflow', "pybind11"]
__PYCGRAPH_KEYWORDS__ = [__PYCGRAPH_NAME__,
"CGraph",
"dag",
"parallel",
"airflow",
"taskflow",
"workflow",
"pybind11"]

_sources = ['PyCGraph.cpp'] + glob.glob("../src/**/*.cpp", recursive=True)
_extra_compile_args = ["-pthread",
Expand Down
2 changes: 1 addition & 1 deletion xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set_project("CGraph")

-- set project version
set_version("3.0.0")
set_version("3.1.0")

-- set language: c++11
set_languages("c++11")
Expand Down
Loading