feat!: drop support for Python <= 3.9 #610

Also try supporting 3.14

Author: brianhuster

.github/workflows/test.yml

@@ -29,15 +29,12 @@ jobs:
       matrix:
         config: [
           # NOTE: don't forget updating tox.ini
+          { python-version: '3.14', neovim-version: 'nightly' },
           { python-version: '3.13', neovim-version: 'nightly' },
           { python-version: '3.12', neovim-version: 'nightly' },
           { python-version: '3.12', neovim-version: 'stable' },
           { python-version: '3.11' },
           { python-version: '3.10' },
-          # for python 3.7~3.9, use older version of OS (ubuntu-20.04 and macos-13)
-          { python-version: '3.9', ubuntu: '20.04', macos: '13' },
-          { python-version: '3.8', ubuntu: '20.04', macos: '13' },
-          { python-version: '3.7', ubuntu: '20.04', macos: '13' },
         ]
         os: ['ubuntu', 'macos', 'windows']
 

README.md

@@ -10,7 +10,7 @@ connecting to and scripting Nvim processes through its msgpack-rpc API.
 Install
 -------
 
-Supports python 3.7 or later.
+Supports python 3.10 or later.
 
 - Installation option #1: install using uv (recommended):
 

pynvim/__init__.py

@@ -6,7 +6,7 @@
 import os
 import sys
 from types import SimpleNamespace as Version
-from typing import List, Optional, cast, overload
+from typing import List, Literal, Optional, cast, overload
 
 from pynvim._version import VERSION, __version__
 from pynvim.api import Nvim, NvimError
@@ -16,11 +16,6 @@
 from pynvim.plugin import (Host, autocmd, command, decode, encoding, function,
                            plugin, rpc_export, shutdown_hook)
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
 
 __all__ = ('tcp_session', 'socket_session', 'stdio_session', 'child_session',
            'start_host', 'autocmd', 'command', 'encoding', 'decode',

pynvim/api/common.py

@@ -1,15 +1,10 @@
 """Code shared between the API classes."""
 import functools
-import sys
 from abc import ABC, abstractmethod
-from typing import (Any, Callable, Generic, Iterator, List, Optional, Tuple, TypeVar,
-                    Union, overload)
+from typing import (Any, Callable, Generic, Iterator, List, Literal, Optional, Protocol,
+                    Tuple, TypeVar, Union, overload)
 
 from msgpack import unpackb
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal, Protocol
-else:
-    from typing import Literal, Protocol
 
 from pynvim.compat import unicode_errors_default
 

pynvim/api/nvim.py

@@ -9,7 +9,7 @@
 from functools import partial
 from traceback import format_stack
 from types import SimpleNamespace
-from typing import (Any, AnyStr, Callable, Dict, Iterator, List, Optional,
+from typing import (Any, AnyStr, Callable, Dict, Iterator, List, Literal, Optional,
                     TYPE_CHECKING, Union)
 
 from msgpack import ExtType
@@ -24,11 +24,6 @@
 if TYPE_CHECKING:
     from pynvim.msgpack_rpc import Session
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
 __all__ = ['Nvim']
 
 

pynvim/compat.py

@@ -3,28 +3,6 @@
 from typing import Any, Dict, Optional
 
 
-def find_module(fullname, path):  # type: ignore
-    """Compatibility wrapper for imp.find_module.
-
-    Automatically decodes arguments of find_module, in Python3
-    they must be Unicode
-    """
-    if isinstance(fullname, bytes):
-        fullname = fullname.decode()
-    if isinstance(path, bytes):
-        path = path.decode()
-    elif isinstance(path, list):
-        newpath = []
-        for element in path:
-            if isinstance(element, bytes):
-                newpath.append(element.decode())
-            else:
-                newpath.append(element)
-        path = newpath
-    from imp import find_module as original_find_module
-    return original_find_module(fullname, path)
-
-
 unicode_errors_default = 'surrogateescape'
 
 NUM_TYPES = (int, float)

pynvim/msgpack_rpc/event_loop/base.py

@@ -1,15 +1,9 @@
 """Common code for event loop implementations."""
 import logging
 import signal
-import sys
 import threading
 from abc import ABC, abstractmethod
-from typing import Any, Callable, List, Optional, Union
-
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
+from typing import Any, Callable, List, Literal, Optional, Union
 
 logger = logging.getLogger(__name__)
 debug, info, warn = (logger.debug, logger.info, logger.warning,)

pynvim/msgpack_rpc/session.py

@@ -1,23 +1,17 @@
 """Synchronous msgpack-rpc session layer."""
 import logging
-import sys
 import threading
 from collections import deque
 from traceback import format_exc
-from typing import (Any, AnyStr, Callable, Deque, List, NamedTuple, Optional, Sequence,
-                    Tuple, Union, cast)
+from typing import (Any, AnyStr, Callable, Deque, List, Literal, NamedTuple, Optional,
+                    Sequence, Tuple, Union, cast)
 
 import greenlet
 
 from pynvim.compat import check_async
 from pynvim.msgpack_rpc.async_session import AsyncSession
 from pynvim.msgpack_rpc.event_loop.base import BaseEventLoop
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
 logger = logging.getLogger(__name__)
 error, debug, info, warn = (logger.error, logger.debug, logger.info,
                             logger.warning,)

pynvim/plugin/decorators.py

@@ -2,16 +2,10 @@
 
 import inspect
 import logging
-import sys
-from typing import Any, Callable, Dict, Optional, TypeVar, Union
+from typing import Any, Callable, Dict, Literal, Optional, TypeVar, Union
 
 from pynvim.compat import unicode_errors_default
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
 logger = logging.getLogger(__name__)
 debug, info, warn = (logger.debug, logger.info, logger.warning,)
 __all__ = ('plugin', 'rpc_export', 'command', 'autocmd', 'function',

pynvim/plugin/script_host.py

@@ -215,41 +215,7 @@ def _get_paths():
             return []
         return discover_runtime_directories(nvim)
 
-    def _find_module(fullname, oldtail, path):
-        import imp
-        idx = oldtail.find('.')
-        if idx > 0:
-            name = oldtail[:idx]
-            tail = oldtail[idx + 1:]
-            fmr = imp.find_module(name, path)
-            module = imp.find_module(fullname[:-len(oldtail)] + name, *fmr)
-            return _find_module(fullname, tail, module.__path__)
-        else:
-            return imp.find_module(fullname, path)
-
-    class VimModuleLoader(object):
-        def __init__(self, module):
-            self.module = module
-
-        def load_module(self, fullname, path=None):
-            # Check sys.modules, required for reload (see PEP302).
-            try:
-                return sys.modules[fullname]
-            except KeyError:
-                pass
-            import imp
-            return imp.load_module(fullname, *self.module)
-
     class VimPathFinder(object):
-        @staticmethod
-        def find_module(fullname, path=None):
-            """Method for Python 2.7 and 3.3."""
-            try:
-                return VimModuleLoader(
-                    _find_module(fullname, fullname, path or _get_paths()))
-            except ImportError:
-                return None
-
         @staticmethod
         def find_spec(fullname, target=None):
             """Method for Python 3.4+."""
@@ -258,8 +224,7 @@ def find_spec(fullname, target=None):
     def hook(path):
         if path == nvim.VIM_SPECIAL_PATH:
             return VimPathFinder
-        else:
-            raise ImportError
+        raise ImportError
 
     return hook