Python 3.11 support

azmeuk · azmeuk · commit ad3e4cc39a63 · 2023-03-12T18:00:53.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - name: Install apt dependencies
-        run: sudo apt-get --yes install apparmor-utils libsasl2-dev python-dev libldap2-dev libssl-dev slapd ldap-utils
+        run: sudo apt-get --yes install apparmor-utils libsasl2-dev python-dev-is-python3 libldap2-dev libssl-dev slapd ldap-utils
       - name: App armor configuration for slapd
         run: sudo aa-complain /usr/sbin/slapd
       - name: Install python dependencies
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,11 +11,11 @@ license = "MIT"
 keywords = ["ldap", "slapd"]
 classifiers = [
     "Intended Audience :: Developers",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: Implementation :: CPython",
     "License :: OSI Approved :: MIT License",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -30,7 +30,7 @@ repository = "https://gitlab.com/python-ldap/python-slapd"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.6, <4"
+python = ">=3.7, <4"
 
 recommonmark = {version = "*", optional=true}
 sphinx = {version = "*", optional=true}
@@ -72,7 +72,7 @@ doctest_optionflags= "ALLOW_UNICODE IGNORE_EXCEPTION_DETAIL ELLIPSIS"
 legacy_tox_ini = """
 [tox]
 isolated_build = true
-envlist = doc,py36,py37,py38,py39,py310,coverage
+envlist = doc,py37,py38,py39,py310,py311,coverage
 skipsdist=true
 
 [testenv]
diff --git a/slapd/__init__.py b/slapd/__init__.py
@@ -476,9 +476,7 @@ def _cli_popen(
         args += extra_args or []
 
         self.logger.debug("Run command: %r", " ".join(args))
-        proc = subprocess.run(
-            args, input=stdin_data, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
+        proc = subprocess.run(args, input=stdin_data, capture_output=True)
         self.logger.debug(
             "stdin_data=%s", stdin_data.decode("utf-8") if stdin_data else stdin_data
         )
