update github actions (#30)

* update CI

* add format

* update version

* update stub

* clean up

* fix CI

* fix CI

* fix

---------

Co-authored-by: tang zhixiong <zhixiong.tang@momenta.ai>

Author: district10

.github/workflows/format.yml

@@ -0,0 +1,29 @@
+# This is a format job. Pre-commit has a first-party GitHub action, so we use
+# that: https://github.com/pre-commit/action
+
+name: Format
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+    - master
+
+jobs:
+  pre-commit:
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: "3.9"
+    - name: Cache pre-commit
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pre-commit
+        key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+        restore-keys: |
+          pre-commit-
+    - uses: pre-commit/action@v3.0.0

.github/workflows/pip.yml

@@ -15,17 +15,33 @@ jobs:
       fail-fast: false
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: ["3.8", "3.12", "pypy-3.9"]
+        python-version: ["3.9", "3.11"]
 
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
+
+    - name: Get pip cache dir
+      id: pip-cache
+      shell: bash
+      run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache pip dependencies
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.python-version }}-
+          ${{ runner.os }}-pip-
 
     - name: Build and install
       run: pip install --verbose .[test]
 
     - name: Test
+      if: ${{ startsWith(matrix.platform, 'ubuntu') }}
       run: pytest

.github/workflows/wheels.yml

@@ -32,8 +32,9 @@ jobs:
     - name: Check metadata
       run: pipx run twine check dist/*
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: cibw-sdist
         path: dist/*.tar.gz
 
 
@@ -43,27 +44,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-14]
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
 
-    - uses: pypa/cibuildwheel@v2.21.1
+    - name: Cache cibuildwheel
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/Library/Caches/pip
+          ~/.cache/pip
+          ~/AppData/Local/pip/Cache
+        key: cibw-pip-${{ matrix.os }}-${{ hashFiles('pyproject.toml') }}
+        restore-keys: |
+          cibw-pip-${{ matrix.os }}-
+
+    - uses: pypa/cibuildwheel@v3.3.1
       env:
         CIBW_ARCHS_MACOS: universal2
-        CIBW_ARCHS_WINDOWS: auto ARM64
+        CIBW_ARCHS_WINDOWS: AMD64 ARM64
         CIBW_BEFORE_BUILD: pip install pytest networkx --prefer-binary
-        CIBW_SKIP: "*musllinux*"
-        CIBW_TEST_SKIP: pp*
+        CIBW_SKIP: "pp* *musllinux* *_i686 cp314t-win*"
+        CIBW_TEST_SKIP: "*macosx* *win* *aarch64 cp314t-*"
 
     - name: Verify clean directory
       run: git diff --exit-code
       shell: bash
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: cibw-wheels-${{ matrix.os }}
         path: wheelhouse/*.whl
 
 
@@ -77,15 +90,16 @@ jobs:
       id-token: write
 
     steps:
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
-        name: artifact
+        pattern: cibw-*
+        merge-multiple: true
         path: dist
 
     - uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        password: ${{ secrets.pypi_password }}

pyproject.toml

@@ -5,8 +5,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "networkx_graph"
-version = "0.2.5"
-url = "https://github.com/cubao/networkx-graph"
+version = "0.2.6"
 description = "Some customized graph algorithms"
 readme = "README.md"
 authors = [
@@ -23,8 +22,13 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 
+[project.urls]
+Homepage = "https://github.com/cubao/networkx-graph"
+
 [project.optional-dependencies]
 test = ["pytest"]
 

src/main.cpp

@@ -2224,24 +2224,8 @@ PYBIND11_MODULE(_core, m)
 
         .. autosummary::
            :toctree: _generate
-
-           add
-           subtract
     )pbdoc";
 
-    m.def("add", &add, R"pbdoc(
-        Add two numbers
-
-        Some other explanation about the add function.
-    )pbdoc");
-
-    m.def(
-        "subtract", [](int i, int j) { return i - j; }, R"pbdoc(
-        Subtract two numbers
-
-        Some other explanation about the subtract function.
-    )pbdoc");
-
     py::class_<Indexer>(m, "Indexer", py::module_local()) //
         .def(py::init<>())
         .def(py::init<const std::map<std::string, int64_t>>(), "index"_a)

src/networkx_graph/__init__.py

@@ -17,8 +17,6 @@
     ZigzagPathGenerator,
     __doc__,
     __version__,
-    add,
-    subtract,
 )
 from ._core import DiGraph as DiGraphImpl
 
@@ -46,8 +44,6 @@ def add_edge(self, node0: str, node1: str, **attr):
 __all__ = [
     "__doc__",
     "__version__",
-    "add",
-    "subtract",
     "Node",
     "Edge",
     "Path",

src/networkx_graph/__main__.py

@@ -18,7 +18,7 @@ import typing
 
 import pybind11_stubgen.typing_ext
 
-__all__ = [
+__all__: list[str] = [
     "Bindings",
     "DiGraph",
     "Edge",
@@ -711,4 +711,4 @@ def subtract(arg0: int, arg1: int) -> int:
     Some other explanation about the subtract function.
     """
 
-__version__: str = "0.2.5"
+__version__: str = "0.2.6"

src/networkx_graph/_core.pyi

@@ -32,15 +32,7 @@ def calculate_md5(filename, block_size=4096):
 
 
 def test_version():
-    assert m.__version__ == "0.2.5"
-
-
-def test_add():
-    assert m.add(1, 2) == 3
-
-
-def test_sub():
-    assert m.subtract(1, 2) == -1
+    assert m.__version__ == "0.2.6"
 
 
 def test_networkx():