Update coding a little bit

- config: drop dead cached_property backport fallback
- errors: raise OSError instead of the IOError alias (and its tests)
- setup.py: use text=True and stdlib logging (log.warning)
- delete setup.cfg, the legacy pycodestyle config (superseded by ruff)

Assisted-by: Kimi Code K3

Author: jdavid

AGENTS.md

@@ -69,7 +69,6 @@ modules:
   also copies `git2.dll` into the package (see `BuildWithDLLs`).
 - **`pyproject.toml`** — Build-system requirements, `cibuildwheel`
   configuration, `ruff` settings, and `codespell` settings.
-- **`setup.cfg`** — Legacy pycodestyle configuration.
 - **`pytest.ini`** — pytest configuration (`--capture=no -ra --verbose`,
   `testpaths = test/`).
 - **`mypy.ini`** — mypy configuration with strict settings.

pygit2/config.py

@@ -24,14 +24,10 @@
 # Boston, MA 02110-1301, USA.
 
 from collections.abc import Callable, Iterator
+from functools import cached_property
 from os import PathLike
 from typing import TYPE_CHECKING, Any, Optional, Self
 
-try:
-    from functools import cached_property
-except ImportError:
-    from cached_property import cached_property  # type: ignore
-
 # Import from pygit2
 from .enums import ConfigLevel
 from .errors import GitError, InvalidError, check_error

pygit2/errors.py

@@ -105,7 +105,7 @@ def check_error(
 
     if err == C.GIT_ENOTFOUND:
         if io:
-            raise IOError(message)
+            raise OSError(message)
 
         raise NotFoundError(message)
 

setup.cfg

@@ -26,9 +26,9 @@
 # mypy: disable-error-code="import-not-found, import-untyped"
 
 # Import setuptools before distutils to avoid user warning
+import logging
 import os
 import sys
-from distutils import log  # type: ignore[attr-defined]
 from distutils.command.build import build
 from distutils.command.sdist import sdist
 from pathlib import Path
@@ -42,15 +42,15 @@
 
 del sys.path[0]
 
+log = logging.getLogger(__name__)
+
 
 libgit2_bin, libgit2_kw = get_libgit2_paths()
 
 
 class sdist_files_from_git(sdist):
     def get_file_list(self) -> None:
-        popen = Popen(
-            ['git', 'ls-files'], stdout=PIPE, stderr=PIPE, universal_newlines=True
-        )
+        popen = Popen(['git', 'ls-files'], stdout=PIPE, stderr=PIPE, text=True)
         stdoutdata, stderrdata = popen.communicate()
         if popen.returncode != 0:
             print(stderrdata)
@@ -118,7 +118,7 @@ def _get_dlls(self) -> list[tuple[Path, Path]]:
                     ret.append((f, target))
                     break
             else:
-                log.warn(f'Could not find required DLL {dll} to include')
+                log.warning(f'Could not find required DLL {dll} to include')
                 log.debug(f'(looked in {look_dirs})')
         return ret
 

setup.py

@@ -51,15 +51,15 @@ def test_config(config: Config) -> None:
 def test_global_config() -> None:
     try:
         assert Config.get_global_config() is not None
-    except IOError as e:
+    except OSError as e:
         settings = Settings()
         pytest.skip(f'Unavailable for testing with home dir = {settings.homedir}: {e}')
 
 
 def test_system_config() -> None:
     try:
         assert Config.get_system_config() is not None
-    except IOError as e:
+    except OSError as e:
         pytest.skip(f'Unavailable for testing: {e}')