From 36b404bafce4b46af680307288f626510a8de20c Mon Sep 17 00:00:00 2001
From: Simon Pichugin <simon.pichugin@gmail.com>
Date: Mon, 23 Sep 2024 15:35:04 -0700
Subject: [PATCH 1/3] Add support for Python 3.13

Update GitHub Actions.
Explicitly install python3-setuptools for Tox env runs on Fedora.
---
 .github/workflows/ci.yml         | 4 +++-
 .github/workflows/tox-fedora.yml | 5 +++--
 setup.py                         | 1 +
 tox.ini                          | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37843f31..2f835d76 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,9 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
           - "pypy3.9"
+          - "pypy3.10"
         image: 
           - "ubuntu-22.04"
         include:
@@ -43,7 +45,7 @@ jobs:
       - name: Disable AppArmor
         run: sudo aa-disable /usr/sbin/slapd
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
diff --git a/.github/workflows/tox-fedora.yml b/.github/workflows/tox-fedora.yml
index b86303fe..4c4c18f0 100644
--- a/.github/workflows/tox-fedora.yml
+++ b/.github/workflows/tox-fedora.yml
@@ -9,7 +9,7 @@ jobs:
   tox_test:
     name: Tox env "${{matrix.tox_env}}" on Fedora
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Tox tests
       uses: fedora-python/tox-github-action@main
       with:
@@ -17,7 +17,7 @@ jobs:
         dnf_install: >
             @c-development openldap-devel python3-devel
             openldap-servers openldap-clients lcov clang-analyzer valgrind
-            enchant
+            enchant python3-setuptools
     strategy:
       matrix:
         tox_env:
@@ -28,6 +28,7 @@ jobs:
         - py310
         - py311
         - py312
+        - py313
         - c90-py36
         - c90-py37
         - py3-nosasltls
diff --git a/setup.py b/setup.py
index dbf66a04..8e7963a1 100644
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,7 @@ class OpenLDAP2:
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     # Note: when updating Python versions, also change tox.ini and .github/workflows/*
 
     'Topic :: Database',
diff --git a/tox.ini b/tox.ini
index beade024..cd5b7daf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,9 @@ python =
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
     pypy3.9: pypy3.9
+    pypy3.10: pypy3.10
 
 [testenv]
 deps =

From 05f95aa027dcf1542f2fd246e130466fbfb6fda5 Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Mon, 23 Sep 2024 15:48:24 -0700
Subject: [PATCH 2/3] Add setuptools to Tox env "doc" on Fedora

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index cd5b7daf..0aef0e08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -100,6 +100,7 @@ deps =
     markdown
     sphinx
     sphinxcontrib-spelling
+    setuptools
 commands =
     {envpython} setup.py check --restructuredtext --metadata --strict
     {envpython} -m markdown README -f {envtmpdir}/README.html

From 245dd4d3875140728950d97410bf5438d7fb1f5d Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Mon, 23 Sep 2024 16:00:07 -0700
Subject: [PATCH 3/3] Add setuptools to [testenv]deps

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 0aef0e08..22752067 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ python =
     pypy3.10: pypy3.10
 
 [testenv]
-deps =
+deps = setuptools
 passenv = WITH_GCOV
 # - Enable BytesWarning
 # - Turn all warnings into exceptions.