Test with Python 3.12 (#537)

tiran · web-flow · commit 2229d8364689 · 2023-10-04T18:42:53.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,22 +1,40 @@
 ---
 name: CI
 
-on: [push, pull_request]
+on: 
+  push:
+  pull_request:
+  schedule:
+    # every Monday
+    - cron: '30 4 * * 1'
+  workflow_dispatch:
 
 permissions:
   contents: read
 
 jobs:
   distros:
     name: "Ubuntu with Python ${{ matrix.python-version }}"
-    runs-on: "ubuntu-20.04"
+    runs-on: "${{ matrix.image }}"
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"]
+        python-version:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "pypy3.9"
+        image: 
+          - "ubuntu-22.04"
+        include:
+          - python-version: "3.6"
+            image: "ubuntu-20.04"
     steps:
       - name: Checkout
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
       - name: Install apt dependencies
         run: |
           set -ex
@@ -25,9 +43,10 @@ jobs:
       - name: Disable AppArmor
         run: sudo aa-disable /usr/sbin/slapd
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       - name: "Install Python dependencies"
         run: |
           set -xe
diff --git a/.github/workflows/tox-fedora.yml b/.github/workflows/tox-fedora.yml
@@ -27,6 +27,7 @@ jobs:
         - py39
         - py310
         - py311
+        - py312
         - c90-py36
         - c90-py37
         - py3-nosasltls
diff --git a/Modules/options.c b/Modules/options.c
@@ -207,8 +207,8 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value)
         }
         else {
             PyErr_Format(PyExc_ValueError,
-                         "timeout must be >= 0 or -1/None for infinity, got %f",
-                         doubleval);
+                         "timeout must be >= 0 or -1/None for infinity, got %S",
+                         value);
             return 0;
         }
         break;
diff --git a/setup.py b/setup.py
@@ -92,6 +92,7 @@ class OpenLDAP2:
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     # Note: when updating Python versions, also change tox.ini and .github/workflows/*
 
     'Topic :: Database',
diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 # Note: when updating Python versions, also change setup.py and .github/worlflows/*
-envlist = py{36,37,38,39,310,311},c90-py{36,37},py3-nosasltls,doc,py3-trace,pypy3
+envlist = py{36,37,38,39,310,311,312},c90-py{36,37},py3-nosasltls,doc,py3-trace,pypy3.9
 minver = 1.8
 
 [gh-actions]
@@ -16,7 +16,8 @@ python =
     3.9: py39, py3-trace
     3.10: py310
     3.11: py311
-    pypy3: pypy3
+    3.12: py312
+    pypy3.9: pypy3.9
 
 [testenv]
 deps =
@@ -28,6 +29,11 @@ setenv =
 commands = {envpython} -bb -Werror \
     -m unittest discover -v -s Tests -p 't_*' {posargs}
 
+[testenv:py312]
+# Python 3.12 headers are incompatible with declaration-after-statement
+setenv =
+    CFLAGS=-Wno-int-in-bool-context -Werror -std=c99
+
 [testenv:py3-nosasltls]
 basepython = python3
 # don't install, install dependencies manually

Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,8 @@ LDAP_set_option(LDAPObject self, int option, PyObject value)`
`207`	`207`	`}`
`208`	`208`	`else {`
`209`	`209`	`PyErr_Format(PyExc_ValueError,`
`210`		`- "timeout must be >= 0 or -1/None for infinity, got %f",`
`211`		`- doubleval);`
	`210`	`+ "timeout must be >= 0 or -1/None for infinity, got %S",`
	`211`	`+ value);`
`212`	`212`	`return 0;`
`213`	`213`	`}`
`214`	`214`	`break;`