comrak 0.0.8__tar.gz → 0.0.9__tar.gz

{comrak-0.0.8 → comrak-0.0.9}/.github/workflows/CI.yml

@@ -14,6 +14,10 @@ on:
       - "*"
   pull_request:
   workflow_dispatch:
+  workflow_run:
+    workflows: ["Deploy Release"]
+    types:
+      - completed
 
 permissions:
   contents: read
@@ -35,6 +39,7 @@ jobs:
         )
       )
       || (github.event_name == 'workflow_dispatch')
+      || (github.event_name == 'workflow_run')
     steps:
       - name: Confirm commit message matched
         run: echo "Commit message matched the condition."
@@ -182,7 +187,7 @@ jobs:
     name: Release
     environment: pypi
     runs-on: ubuntu-latest
-    if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
+    if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run' }}
     needs: [linux, musllinux, windows, macos, sdist]
     permissions:
       # Use to sign the release artifacts
@@ -198,7 +203,7 @@ jobs:
         with:
           subject-path: "wheels-*/*"
       - name: Publish to PyPI
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        if: ${{ startsWith(github.ref, 'refs/tags/') }} || (github.event_name == 'workflow_run')
         uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
         with:
           command: upload

comrak-0.0.9/.github/workflows/deploy.yml

@@ -0,0 +1,36 @@
+name: Deploy Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy-release:
+    name: Run just release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: true
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Install just
+        uses: taiki-e/install-action@64adfd9e935fa438859b9e080fd026720b2ba070 # tag=just
+        with:
+          tool: just@1.38.0,echo-comment@0.2.0
+
+      - name: Configure git identity
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      # Bump version, commit changes, tag as `py-v*`, and push both
+      # commit and tag (pushing the latter triggers package release)
+      - name: Run just release
+        run: just release

comrak-0.0.9/.github/workflows/test.yml

@@ -0,0 +1,111 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  get-python-versions:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    outputs:
+      python-versions: ${{ steps.get-versions.outputs.python-versions }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Get Python versions from uv
+        id: get-versions
+        run: |
+          set -euo pipefail
+          MIN_VERSION=$(uvx --from=toml-cli toml get --toml-path=pyproject.toml project.requires-python | sed 's/>=//;s/"//g')
+          PYO3_FFI_VERSION=$(grep -m 1 -A 1 'name = "pyo3-ffi"' Cargo.lock | tail -n1 | cut -d '"' -f 2)
+          # Download the crate once and reuse the Cargo.toml extraction to avoid repeated curl calls
+          TMP_CRATE=$(mktemp)
+          curl -sL "https://static.crates.io/crates/pyo3-ffi/pyo3-ffi-$PYO3_FFI_VERSION.crate" -o "$TMP_CRATE"
+          # extract Cargo.toml content from the downloaded crate
+          CARGO_TOML_CONTENT=$(tar -xzO -f "$TMP_CRATE" "pyo3-ffi-$PYO3_FFI_VERSION/Cargo.toml" 2>/dev/null || true)
+          # get the supported CPython max version from the pyo3-ffi crate (from the extracted Cargo.toml)
+          MAX_VERSION=$(echo "$CARGO_TOML_CONTENT" | uvx --from=toml-cli toml get --toml-path=/dev/stdin package.metadata.cpython.max-version | tr -d '"')
+          # get the supported PyPy min version
+          PYPY_MIN=$(echo "$CARGO_TOML_CONTENT" | uvx --from=toml-cli toml get --toml-path=/dev/stdin package.metadata.pypy.min-version | tr -d '"')
+          # get the supported PyPy max version
+          PYPY_MAX=$(echo "$CARGO_TOML_CONTENT" | uvx --from=toml-cli toml get --toml-path=/dev/stdin package.metadata.pypy.max-version | tr -d '"')
+          # gather the list once and derive CPython and (optional) PyPy sets from it
+          LIST=$(uv python list --all-versions --output-format json)
+
+          CPYTHON_VERSIONS=$(echo "$LIST" | jq -c --arg min "$MIN_VERSION" --arg max "$MAX_VERSION" '
+            ($min | split(".") | {major: .[0]|tonumber, minor: .[1]|tonumber}) as $minv |
+            ($max | split(".") | {major: .[0]|tonumber, minor: .[1]|tonumber}) as $maxv |
+            [.[] | {v:.version_parts, t:.variant, impl:.implementation}]
+            | unique_by([.v.minor,.t])
+            | map(select(
+                (.impl == "cpython") and
+                ((.v.major > $minv.major or (.v.major == $minv.major and .v.minor >= $minv.minor)) and
+                 (.v.major < $maxv.major or (.v.major == $maxv.major and .v.minor <= $maxv.minor)))
+              ))
+            | map("\(.v.major).\(.v.minor)\(if .t=="freethreaded" then "t" else "" end)")')
+          PYPY_VERSIONS=$(echo "$LIST" | jq -c --arg min "$PYPY_MIN" --arg max "$PYPY_MAX" '
+            ($min | split(".") | {major: .[0]|tonumber, minor: .[1]|tonumber}) as $minv |
+            ($max | split(".") | {major: .[0]|tonumber, minor: .[1]|tonumber}) as $maxv |
+            [.[] | {v:.version_parts, t:.variant, impl:.implementation}]
+            | unique_by([.v.minor,.impl])
+            | map(select(
+                (.impl == "pypy") and
+                ((.v.major > $minv.major or (.v.major == $minv.major and .v.minor >= $minv.minor)) and
+                  (.v.major < $maxv.major or (.v.major == $maxv.major and .v.minor <= $maxv.minor)))
+              ))
+            | map("pypy-\(.v.major).\(.v.minor)")')
+          # merge arrays
+          versions=$(jq -nc --argjson a "$CPYTHON_VERSIONS" --argjson b "$PYPY_VERSIONS" '$a + $b')
+
+          echo "python-versions=$versions" >> $GITHUB_OUTPUT
+
+  test:
+    needs: get-python-versions
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ${{ fromJson(needs.get-python-versions.outputs.python-versions) }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up mold linker
+        uses: rui314/setup-mold@v1
+
+      - uses: Swatinem/rust-cache@v2.8.1
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: false # true
+          python-version: ${{ matrix.python-version }}
+
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Sync build and test dependencies
+        run: uv sync --only-group build --only-group test
+
+      - name: Build extension
+        run: |
+          # https://github.com/astral-sh/uv/issues/16434
+          # $(uv python find) -m maturin develop --uv
+          .venv/bin/python -m maturin develop --uv
+
+      - name: Run tests
+        run: |
+          # https://github.com/astral-sh/uv/issues/16434
+          # $(uv python find) -m pytest
+          .venv/bin/pytest

{comrak-0.0.8 → comrak-0.0.9}/.pre-commit-config.yaml

@@ -23,25 +23,11 @@ repos:
       - id: end-of-file-fixer
       - id: name-tests-test
       - id: trailing-whitespace
-  - repo: https://github.com/pappasam/toml-sort
-    rev: v0.24.3
-    hooks:
-      - id: toml-sort-fix
-        exclude: ^Cargo.lock$
-  - repo: https://github.com/asottile/add-trailing-comma
-    rev: v4.0.0
-    hooks:
-      - id: add-trailing-comma
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.0
-    hooks:
-      - id: pyupgrade
-        args: [--py310-plus]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.1
     hooks:
       # Run the linter
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
       # Run the formatter
       - id: ruff-format

{comrak-0.0.8 → comrak-0.0.9}/Cargo.toml

@@ -1,6 +1,6 @@
 [dependencies]
 comrak_lib = {package = "comrak", version = "0.45.0", features = ["shortcodes"]}
-pyo3 = "0.27.0"
+pyo3 = {version = "0.27.0", features = ["abi3"]}
 
 [lib]
 name = "comrak"

{comrak-0.0.8 → comrak-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comrak
-Version: 0.0.8
+Version: 0.0.9
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust

{comrak-0.0.8 → comrak-0.0.9}/pyproject.toml

@@ -51,7 +51,7 @@ keywords = [
 ]
 readme = "README.md"
 requires-python = ">=3.9"
-version = "0.0.8"
+version = "0.0.9"
 
 [project.license]
 file = "LICENSE"
@@ -65,6 +65,13 @@ features = [
   "pyo3/extension-module"
 ]
 
+[tool.pytest.ini_options]
+testpaths = "tests"
+addopts = "-v"
+
+[tool.ruff]
+extend-select = ["F", "UP"]
+
 [tool.uv]
 # Build Rust code in development mode (faster builds)
 # config-settings = { build-args = "--profile=dev" }

{comrak-0.0.8 → comrak-0.0.9}/uv.lock

@@ -59,7 +59,7 @@ wheels = [
 
 [[package]]
 name = "comrak"
-version = "0.0.8"
+version = "0.0.9"
 source = { editable = "." }
 
 [package.dev-dependencies]

comrak-0.0.8/.github/workflows/test.yml

@@ -1,86 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  get-python-versions:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    outputs:
-      python-versions: ${{ steps.get-versions.outputs.python-versions }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-
-      - name: Get Python versions from uv
-        id: get-versions
-        run: |
-          set -euo pipefail
-          MIN_VERSION=$(uvx --from=toml-cli toml get --toml-path=pyproject.toml project.requires-python | sed 's/>=//;s/"//g')
-          PYO3_FFI_VERSION=$(grep -m 1 -A 1 'name = "pyo3-ffi"' Cargo.lock | tail -n1 | cut -d '"' -f 2)
-          MAX_VERSION=$(
-            curl -sL "https://static.crates.io/crates/pyo3-ffi/pyo3-ffi-$PYO3_FFI_VERSION.crate" \
-            | tar -xzO "pyo3-ffi-$PYO3_FFI_VERSION/Cargo.toml" \
-            | uvx --from=toml-cli toml get --toml-path=/dev/stdin package.metadata.cpython.max-version \
-            | tr -d '"'
-          )
-          versions=$(uv python list --all-versions --output-format json | jq -c --arg min "$MIN_VERSION" --arg max "$MAX_VERSION" '
-            ($min | split(".") | {major: .[0]|tonumber, minor: .[1]|tonumber}) as $minv |
-            ($max | split(".") | {major: .[0]|tonumber, minor: .[1]|tonumber}) as $maxv |
-            [.[] | {v:.version_parts, t:.variant}]
-            | unique_by([.v.minor,.t])
-            | map(select(
-                (.v.major > $minv.major or (.v.major == $minv.major and .v.minor >= $minv.minor)) and
-                (.v.major < $maxv.major or (.v.major == $maxv.major and .v.minor <= $maxv.minor))
-              ))
-            | map("\(.v.major).\(.v.minor)\(if .t=="freethreaded" then "t" else "" end)")')
-          echo "python-versions=$versions" >> $GITHUB_OUTPUT
-
-  test:
-    needs: get-python-versions
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ${{ fromJson(needs.get-python-versions.outputs.python-versions) }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up mold linker
-        uses: rui314/setup-mold@v1
-
-      - uses: Swatinem/rust-cache@v2.8.1
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-        with:
-          enable-cache: false # true
-          python-version: ${{ matrix.python-version }}
-
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Sync build and test dependencies
-        run: uv sync --only-group build --only-group test
-
-      - name: Build extension
-        run: |
-          source .venv/bin/activate
-          .venv/bin/maturin develop --uv
-
-      - name: Run tests
-        run: |
-          source .venv/bin/activate
-          .venv/bin/pytest tests/ -v