Merge pull request #68 from akhundMurad/fix/ci-cd

resolve issues between rust and python parts

Author: akhundMurad

.github/workflows/pr.yml

@@ -21,7 +21,6 @@ jobs:
       - name: Sync dependencies (locked)
         run: |
           uv sync --locked --all-groups
-          uv sync --extra rust
 
       - name: Run linters
         run: |
@@ -44,7 +43,6 @@ jobs:
       - name: Sync dependencies (locked)
         run: |
           uv sync --locked --all-groups
-          uv sync --extra rust
 
       - name: Run tests
         run: |

.github/workflows/publish.yml

@@ -12,36 +12,15 @@ jobs:
   test:
     uses: ./.github/workflows/test.yml
 
-  publish-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v3
-
-      - name: Sync dependencies (locked)
-        run: |
-          uv sync --locked --all-groups
-
-      - name: Deploy to Pages
-        run: uv run mkdocs gh-deploy --force
-
   build-wheels:
     name: Build wheels (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
-    needs:
-      - test
-      - publish-docs
+    needs: test
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - name: Checkout
@@ -76,8 +55,7 @@ jobs:
 
   build-sdist:
     runs-on: ubuntu-latest
-    needs:
-      - test
+    needs: build-wheels
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -106,11 +84,9 @@ jobs:
           name: sdist
           path: dist/*.tar.gz
 
-  publish:
+  publish-package:
     runs-on: ubuntu-latest
-    needs:
-      - build-wheels
-      - build-sdist
+    needs: build-sdist
     permissions:
       contents: read
       id-token: write
@@ -131,3 +107,23 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: out
+
+  publish-docs:
+    runs-on: ubuntu-latest
+    needs: publish-package
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+
+      - name: Sync dependencies (locked)
+        run: |
+          uv sync --locked --all-groups
+
+      - name: Deploy to Pages
+        run: uv run mkdocs gh-deploy --force

.github/workflows/test.yml

@@ -37,7 +37,6 @@ jobs:
       - name: Sync dependencies (locked)
         run: |
           uv sync --locked --all-groups
-          uv sync --extra rust
 
       - name: Run tests
         run: |

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "typeid-python"
-version = "0.3.5"
+version = "0.3.6"
 description = "Python implementation of TypeIDs: type-safe, K-sortable, and globally unique identifiers inspired by Stripe IDs"
 authors = [{ name = "Murad Akhundov", email = "[email protected]" }]
 requires-python = ">=3.10,<4"
@@ -27,9 +27,9 @@ dependencies = ["uuid6>=2024.7.10,<2026.0.0"]
 [project.optional-dependencies]
 cli = ["click"]
 yaml = ["PyYAML"]
-rust = ["uuid-utils>=0.12.0"]
+rust = ["uuid-utils>=0.12.0", "typeid_base32>=0.3.5,<0.4.0"]
 
-[project.urls]
+[project.urls] 
 Homepage = "https://github.com/akhundMurad/typeid-python"
 Repository = "https://github.com/akhundMurad/typeid-python"
 "Bug Tracker" = "https://github.com/akhundMurad/typeid-python/issues"

rust-base32/Cargo.toml

@@ -9,4 +9,3 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.27.2", features = ["extension-module"] }
-

tests/test_uuid_backend.py

@@ -11,6 +11,11 @@
     ],
 )
 def test_backend_forced(monkeypatch, value, expected):
+    try:
+        import uuid_utils  # noqa: F401
+    except Exception:
+        pytest.skip("Rust extension uuid_utils not installed in this environment")
+
     monkeypatch.setenv("TYPEID_UUID_BACKEND", value)
     backend = get_uuid_backend()
     assert backend.name == expected