From a134031475fc3bf710671261d3903abecd8e04ef Mon Sep 17 00:00:00 2001
From: Alex Petenchea <alex.petenchea@gmail.com>
Date: Sun, 4 Oct 2026 19:15:13 +0800
Subject: [PATCH 1/2] Update pypi publishing

---
 .github/workflows/pypi.yaml | 54 +++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
index fd210010..e4620cfa 100644
--- a/.github/workflows/pypi.yaml
+++ b/.github/workflows/pypi.yaml
@@ -1,11 +1,14 @@
-name: Upload to PyPI
+name: Publish
 
 on:
   release:
     types: [published]
 
+permissions:
+  contents: read
+
 jobs:
-  upload:
+  build:
     runs-on: ubuntu-latest
 
     steps:
@@ -14,27 +17,50 @@ jobs:
         with:
           fetch-depth: 0
           fetch-tags: true
+          persist-credentials: false
 
       - uses: actions/setup-python@v7
         with:
           python-version: "3.12"
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
+        run: python -m pip install build
 
       - name: Build distribution
         run: python -m build
 
-      - name: Publish to PyPI Test
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TEST_TOKEN }}
-        run: twine upload --verbose --repository testpypi dist/*
+      - uses: actions/upload-artifact@v5
+        with:
+          name: dist
+          path: dist/
+          if-no-files-found: error
+
+  testpypi:
+    needs: build
+    runs-on: ubuntu-latest
+    environment: testpypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v6
+        with:
+          name: dist
+          path: dist/
+      - name: Publish to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
 
+  pypi:
+    needs: testpypi
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v6
+        with:
+          name: dist
+          path: dist/
       - name: Publish to PyPI
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: twine upload --verbose --repository pypi dist/*
+        uses: pypa/gh-action-pypi-publish@release/v1

From 1cafa5fea80e8aaa5a29eca6d9a53b27d29e88e1 Mon Sep 17 00:00:00 2001
From: Alex Petenchea <alex.petenchea@gmail.com>
Date: Sun, 4 Oct 2026 19:15:25 +0800
Subject: [PATCH 2/2] Update version

---
 arango/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arango/version.py b/arango/version.py
index 1d3073fe..cfac1ae0 100644
--- a/arango/version.py
+++ b/arango/version.py
@@ -1 +1 @@
-__version__ = "8.3.5"
+__version__ = "8.3.6"